diff --git a/README.md b/README.md
index af9d77a..88d0651 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,9 @@
## About
Tooter is Mastodon client for [Sailfish OS](https://sailfishos.org).
-This fork is being used to further develop and maintain the Tooter app by dysko ([harbour-tooter](https://github.com/dysk0/harbour-tooter)).
+This fork is being used to further develop and maintain the Tooter app by dysko ([harbour-tooter](https://github.com/dysk0/harbour-tooter)) and molan [OpenRepos.net](https://openrepos.net/content/molan/tooter-v).
+
+This fork continues the work done by molan, thanks! primary distribution is through obs/chum but build actions on github provide a build here on github with every release. As soon as migration code for sailjail paths is implemented, tooter will make it to the harbour!
* Releases from this repository (Tooter β from release branch *master*) can be found on [OpenRepos.net](https://openrepos.net/content/molan/tooter-v)
* Releases by dysko can be found on the Jolla store and on [OpenRepos.net](https://openrepos.net/content/dysko/tooter)
@@ -13,11 +15,9 @@ Clone / download this repository and import it into your SailfishOS IDE using th
## Repository branches:
* master: release branch which includes specifics for harbour-tooterb (Tooter β)
-* upstream: main development branch which is used to send changes to the upstream repository (harbour-tooter)
## Contributions
Contributions to this project are very welcome, since there are still many things which can be done for Tooter. If you already know what you want to add or fix, please make a Pull Request (PR) with your proposal. Your PR should include an explanation or a change log summary. Merging will not be allowed until the PR has been reviewed.
-Please fork the [upstream branch](https://github.com/molan-git/harbour-tooter/tree/upstream) if you want to contribute to this project.
## Screenshots
diff --git a/harbour-tooterb.pro.user b/harbour-tooterb.pro.user
index d9d1315..c7e76d3 100644
--- a/harbour-tooterb.pro.user
+++ b/harbour-tooterb.pro.user
@@ -1,10 +1,10 @@
-
+
EnvironmentId
- {2300d91c-2a31-49b1-8a21-a10867defb10}
+ {ddbad1fa-3e15-4c49-99dc-7ab87bce53d2}
ProjectExplorer.Project.ActiveTarget
@@ -70,9 +70,7 @@
0
true
-
- -fno-delayed-template-parsing
-
+
true
Builtin.BuildSystem
@@ -94,7 +92,7 @@
SailfishOS-4.4.0.58-aarch64 (in Sailfish SDK Build Engine)
SailfishOS-4.4.0.58-aarch64 (in Sailfish SDK Build Engine)
SailfishOS-4.4.0.58-aarch64.default
- 0
+ 1
0
0
@@ -104,8 +102,8 @@
- C:\Users\XPAM\Github\Github-App\build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Debug
- C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Debug
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Debug
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Debug
true
@@ -161,8 +159,8 @@
- C:\Users\XPAM\Github\Github-App\build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Release
- C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Release
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Release
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Release
true
@@ -219,8 +217,8 @@
- C:\Users\XPAM\Github\Github-App\build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Profile
- C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Profile
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Profile
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Profile
true
@@ -303,7 +301,11 @@
true
QmakeProjectManager.MerRpmBuildStep
- 1
+
+ true
+ QmakeProjectManager.MerRpmValidationStep
+
+ 2
Deploy
Deploy
ProjectExplorer.BuildSteps.Deploy
@@ -402,100 +404,24 @@
true
- C:/Users/XPAM/Github/Github-App/harbour-tooter
- false
- -1
- 3
-
- 2
-
- ProjectExplorer.CustomExecutableRunConfiguration
-
- false
- true
- false
- true
-
-
- dwarf
-
- cpu-cycles
-
-
- 250
-
- -e
- cpu-cycles
- --call-graph
- dwarf,4096
- -F
- 250
-
- -F
- true
- 4096
- false
- false
- 1000
-
- true
-
-
- false
- false
- false
- false
- true
- 0.01
- 10
- true
- kcachegrind
- 1
-
- 25
-
- 1
- true
- false
- true
-
- valgrind
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
- 11
- 12
- 13
- 14
-
-
- true
- C:/Users/XPAM/Github/Github-App/harbour-tooter
- false
+ /home/mwa/src/sailfish/harbour-tooter
+ true
-1
3
1
- Custom Executable2
- QmakeProjectManager.MerCustomRunConfiguration:
-
+ harbour-tooterb (on %{Device:Name})
+ QmakeProjectManager.MerRunConfiguration:/home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro
+ /home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro
1
false
true
false
true
+ :0.0
- 2
+ 1
@@ -515,8 +441,8 @@
- C:\Users\XPAM\Github\Github-App\build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Debug
- C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Debug
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Debug
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Debug
true
@@ -572,8 +498,8 @@
- C:\Users\XPAM\Github\Github-App\build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Release
- C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Release
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Release
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Release
true
@@ -630,8 +556,8 @@
- C:\Users\XPAM\Github\Github-App\build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Profile
- C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Profile
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Profile
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Profile
true
@@ -714,7 +640,11 @@
true
QmakeProjectManager.MerRpmBuildStep
- 1
+
+ true
+ QmakeProjectManager.MerRpmValidationStep
+
+ 2
Deploy
Deploy
ProjectExplorer.BuildSteps.Deploy
@@ -813,19 +743,22 @@
true
- C:/Users/XPAM/Github/Github-App/harbour-tooter
+ /home/mwa/src/sailfish/harbour-tooter
false
-1
3
- 2
+ 1
- ProjectExplorer.CustomExecutableRunConfiguration
-
+ harbour-tooterb (on %{Device:Name})
+ QmakeProjectManager.MerRunConfiguration:/home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro
+ /home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro
+ 1
false
true
false
true
+ :0.0
dwarf
@@ -890,21 +823,22 @@
true
- C:/Users/XPAM/Github/Github-App/harbour-tooter
+ /home/mwa/src/sailfish/harbour-tooter
false
-1
3
1
- Custom Executable2
- QmakeProjectManager.MerCustomRunConfiguration:
-
+ harbour-tooterb
+ QmakeProjectManager.MerRunConfiguration:/home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro
+ /home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro
1
false
true
false
true
+ :0.0
2
@@ -926,8 +860,8 @@
- C:\Users\XPAM\Github\Github-App\build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Debug
- C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Debug
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Debug
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Debug
true
@@ -983,8 +917,8 @@
- C:\Users\XPAM\Github\Github-App\build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Release
- C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Release
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Release
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Release
true
@@ -1041,8 +975,8 @@
- C:\Users\XPAM\Github\Github-App\build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Profile
- C:/Users/XPAM/Github/Github-App/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Profile
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Profile
+ /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Profile
true
@@ -1224,7 +1158,7 @@
true
- C:/Users/XPAM/Github/Github-App/harbour-tooter
+ /home/mwa/src/sailfish/harbour-tooter
false
-1
3
@@ -1301,7 +1235,7 @@
true
- C:/Users/XPAM/Github/Github-App/harbour-tooter
+ /home/mwa/src/sailfish/harbour-tooter
false
-1
3
@@ -1315,6 +1249,7 @@
true
false
true
+ :0.0
2
diff --git a/qml/lib/Worker.js b/qml/lib/Worker.js
index 57eaab4..576ee87 100644
--- a/qml/lib/Worker.js
+++ b/qml/lib/Worker.js
@@ -63,7 +63,7 @@ WorkerScript.onMessage = function(msg) {
*/
if (msg.action === "bookmarks" ||
- ( msg.action === "timelines/home" && msg.mode === "append") ||
+ //( msg.action === "timelines/home" && msg.mode === "append") ||
( msg.action.indexOf("timelines/tag/") !== -1 ) ){
API.getLink(msg.action, msg.params, function(data) {
if (debug) console.log(JSON.stringify(data))
@@ -201,12 +201,10 @@ function addDataToModel (model, mode, items) {
} else if (mode === "prepend") {
for(i = length-1; i >= 0 ; i--) {
-
- model.insert(0,items[i])
-
- /*if ( knownIds.indexOf( items[i]["id"]) === -1) {
+ //model.insert(0,items[i])
+ if ( knownIds.indexOf( items[i]["id"]) === -1) {
model.insert(0,items[i])
- }*/
+ }
}
}
model.sync()
diff --git a/qml/pages/components/MyList.qml b/qml/pages/components/MyList.qml
index 3c7d486..87f58cd 100644
--- a/qml/pages/components/MyList.qml
+++ b/qml/pages/components/MyList.qml
@@ -343,7 +343,12 @@ SilicaListView {
}
}
if (mode === "prepend" && model.count) {
- p.push({name:'since_id', data: model.get(0).id})
+ if ( linknext === "" ) {
+ p.push({name:'since_id', data: model.get(0).id})
+ } else {
+ p.push({name: 'since_id', data: linknext})
+ }
+ //p.push({name:'since_id', data: model.get(0).id})
}
// to keep the number of params the same for all requests
diff --git a/rpm/harbour-tooterb.spec b/rpm/harbour-tooterb.spec
index 5b3cb58..b674bc1 100644
--- a/rpm/harbour-tooterb.spec
+++ b/rpm/harbour-tooterb.spec
@@ -13,8 +13,8 @@ Name: harbour-tooterb
%{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Tooter β
-Version: 1.1.6
-Release: 3
+Version: 1.1.7
+Release: 1
Group: Qt/Qt
License: GPLv3
URL: https://github.com/poetaster/harbour-tooter#readme
@@ -39,14 +39,13 @@ BuildRequires: desktop-file-utils
Tooter Beta is a native client for Mastodon network instances.
%if "%{?vendor}" == "chum"
-PackageName: Tooter Beta
+PackageName: Tooter β
Type: desktop-application
Categories:
- Network
-PackagerName: Alain Molteni (molan)
+PackagerName: Mark Washeim (poetaster)
Custom:
- - Repo: https://github.com/molan-git/harbour-tooter
- - PackagingRepo: https://github.com/poetaster/harbour-tooter
+ - Repo: https://github.com/poetaster/harbour-tooter
Icon: https://raw.githubusercontent.com/poetaster/harbour-tooter/master/icons/256x256/harbour-tooterb.png
Url:
- Bugtracker: https://github.com/poetaster/harbour-tooter/issues