|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tooterb.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tooterb.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/poetaster/harbour-tooter.git</param>
<param name="branch">master</param>
- <param name="revision">1.1.3</param>
+ <param name="revision">1.1.4</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-tooterb-1.1.4.tar.bz2/.github/workflows/build.yaml
^
|
| @@ -0,0 +1,76 @@
+name: Build RPMs
+
+on:
+ push:
+ tags:
+ - "1.*"
+
+env:
+ OS_VERSION: 4.4.0.68
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ name: Build App
+ strategy:
+ matrix:
+ arch: ['armv7hl', 'aarch64', 'i486']
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Prepare
+ run: docker pull coderus/sailfishos-platform-sdk:$OS_VERSION && mkdir output
+
+ - name: Build ${{ matrix.arch }}
+ run: docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$OS_VERSION /bin/bash -c "
+ mkdir -p build ;
+ cd build ;
+ cp -r /share/* . ;
+ mb2 -t SailfishOS-$OS_VERSION-${{ matrix.arch }} build ;
+ sudo cp -r RPMS/*.rpm /share/output"
+
+ - name: Upload RPM (${{ matrix.arch }})
+ uses: actions/upload-artifact@v2
+ with:
+ name: rpm-${{ matrix.arch }}
+ path: output
+ release:
+ name: Release
+ if: startsWith(github.ref, 'refs/tags/1.1')
+ needs:
+ - build
+ runs-on: ubuntu-latest
+ steps:
+ - name: Download armv7hl
+ uses: actions/download-artifact@v2
+ with:
+ name: rpm-armv7hl
+ continue-on-error: true
+ - name: Download aarch64
+ uses: actions/download-artifact@v2
+ with:
+ name: rpm-aarch64
+ continue-on-error: true
+ - name: Download i486
+ uses: actions/download-artifact@v2
+ with:
+ name: rpm-i486
+ continue-on-error: true
+ - name: Extract Version Name
+ id: extract_name
+ uses: actions/github-script@v4
+ with:
+ result-encoding: string
+ script: |
+ return context.payload.ref.replace(/refs\/tags\//, '');
+ - name: Create a Release
+ uses: softprops/action-gh-release@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ name: ${{ steps.extract_name.outputs.result }}
+ draft: false
+ prerelease: false
+ body: This release was autogenerated.
+ files: '*.rpm'
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tooterb-1.1.4.tar.bz2/harbour-tooterb.pro.user
^
|
| @@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.15.2, 2022-12-02T16:03:12. -->
+<!-- Written by QtCreator 4.15.2, 2023-01-18T08:56:46. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -92,7 +92,7 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SailfishOS-4.4.0.58-aarch64 (in Sailfish SDK Build Engine)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SailfishOS-4.4.0.58-aarch64 (in Sailfish SDK Build Engine)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">SailfishOS-4.4.0.58-aarch64.default</value>
- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tooterb-1.1.4.tar.bz2/qml/lib/Worker.js
^
|
| @@ -1,6 +1,6 @@
Qt.include("Mastodon.js")
-var debug = true;
+var debug = false;
var loadImages = true;
// used to dedupe on append/insert
var knownIds = [];
@@ -8,27 +8,24 @@
var since_id;
WorkerScript.onMessage = function(msg) {
-/*
- console.log("Action > " + msg.action)
- console.log("Model > " + msg.model)
- console.log("Mode > " + msg.mode)
- console.log("Conf > " + JSON.stringify(msg.conf))
- console.log("Params > " + JSON.stringify(msg.params))
-*/
- // this is not elegant. it's max_id and ids from MyList
+ if (debug) console.log("Action > " + msg.action)
+ if (debug) console.log("Mode > " + msg.mode)
- if (msg.params[1]) {
+ // this is not elegant. it's max_id and ids from MyList
+ // we should always get max_id on append
+ if (msg.mode === "append") {
if ( msg.params[0]["name"] === "max_id" ) {
max_id = msg.params[0]["data"]
- } else {
- since_id = msg.params[0]["data"]
- }
- // we don't want to pass it onto the backend
- if ( msg.params[1]["name"] === "ids" ) {
- knownIds = msg.params[1]["data"]
- msg.params.pop()
}
+ } else if ( msg.mode === "prepend" && msg.params[0]) {
+
+ // prepend could be min_id or since_id
+ since_id = msg.params[0]["data"]
+
+ }
+ // ids are always the last param
+ if (msg.params[2]) {
if ( msg.params[2]["name"] === "ids" ) {
knownIds = msg.params[2]["data"]
msg.params.pop()
@@ -65,7 +62,9 @@
* this falls through and continues for GET
*/
- if (msg.action === "bookmarks"){
+ if (msg.action === "bookmarks" ||
+ ( 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))
WorkerScript.sendMessage({ 'LinkHeader': data })
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tooterb-1.1.4.tar.bz2/qml/pages/MainPage.qml
^
|
| @@ -158,7 +158,11 @@
delegate: VisualContainer
Component.onCompleted: {
view.type = "timelines/tag/"+tlSearch.search.substring(1)
- view.loadData("append")
+ if (mdl.count) {
+ view.loadData("append")
+ } else {
+ view.loadData("prepend")
+ }
}
}
}
@@ -230,7 +234,11 @@
delegate: VisualContainer
Component.onCompleted: {
view3.type = "timelines/tag/"+tlSearch.search
- view3.loadData("append")
+ if (mdl.count) {
+ view3.loadData("append")
+ } else {
+ view3.loadData("prepend")
+ }
}
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tooterb-1.1.4.tar.bz2/qml/pages/components/MyList.qml
^
|
| @@ -350,11 +350,16 @@
}
}
- //if (debug) console.log(JSON.stringify(uniqueIds))
+ // to keep the number of params the same for all requests
+ // always set local
+
if(title === "Local") {
type = "timelines/public"
p.push({name:'local', data: "true"})
+ } else {
+ p.push({name:'local', data: "false"})
}
+
// we push the ids via params which we remove in the WorkerScript
if (model.count) {
p.push({name:'ids', data: uniqueIds})
|
