Merge pull request #260 from ioriayane/Release/v0.36.0

Release/v0.36.0
ioriayane · Sep 1, 2024 · 012a5fb · 012a5fb
2 parents 24bdf00 + 966dd9e
commit 012a5fb
Show file tree

Hide file tree

Showing 44 changed files with 1,161 additions and 179 deletions.
diff --git a/.gitignore b/.gitignore
@@ -71,6 +71,8 @@ openssl/share
 openssl/*.cnf
 openssl/*.cnf.dist
 
+.DS_Store
+
 # Hugo
 web/public/*
 web/.hugo_build.lock

diff --git a/1stparty/atproto b/1stparty/atproto
diff --git a/app/i18n/app_ja.qm b/app/i18n/app_ja.qm
diff --git a/app/i18n/app_ja.ts b/app/i18n/app_ja.ts
diff --git a/app/main.cpp b/app/main.cpp
@@ -17,6 +17,7 @@
 #include "qtquick/timeline/authorfeedlistmodel.h"
 #include "qtquick/timeline/anyfeedlistmodel.h"
 #include "qtquick/timeline/actorlikelistmodel.h"
+#include "qtquick/timeline/quotedpostlistmodel.h"
 #include "qtquick/profile/followslistmodel.h"
 #include "qtquick/profile/followerslistmodel.h"
 #include "qtquick/profile/blockslistmodel.h"
@@ -90,7 +91,7 @@ int main(int argc, char *argv[])
     app.setOrganizationName(QStringLiteral("relog"));
     app.setOrganizationDomain(QStringLiteral("hagoromo.relog.tech"));
     app.setApplicationName(QStringLiteral("Hagoromo"));
-    app.setApplicationVersion(QStringLiteral("0.35.0"));
+    app.setApplicationVersion(QStringLiteral("0.36.0"));
 #ifndef HAGOROMO_RELEASE_BUILD
     app.setApplicationVersion(app.applicationVersion() + "d");
 #endif
@@ -132,6 +133,8 @@ int main(int argc, char *argv[])
                                             "FeedGeneratorListModel");
     qmlRegisterType<ActorFeedGeneratorListModel>("tech.relog.hagoromo.actorfeedgeneratorlistmodel",
                                                  1, 0, "ActorFeedGeneratorListModel");
+    qmlRegisterType<QuotedPostListModel>("tech.relog.hagoromo.quotedpostlistmodel", 1, 0,
+                                         "QuotedPostListModel");
     qmlRegisterType<LanguageListModel>("tech.relog.hagoromo.languagelistmodel", 1, 0,
                                        "LanguageListModel");
     qmlRegisterType<ContentFilterSettingListModel>(

diff --git a/app/qml/dialogs/ColumnSettingDialog.qml b/app/qml/dialogs/ColumnSettingDialog.qml
@@ -42,6 +42,8 @@ Dialog {
         states: [
             State { // Timeline
                 when: columnSettingDialog.componentType === 0
+                PropertyChanges { target: autoLoadingCheckbox; visible: true }
+                PropertyChanges { target: autoLoadingIntervalLayout; visible: true }
                 PropertyChanges { target: displayFrame; visible: true }
                 PropertyChanges { target: visibleReplyToUnfollowedUsersCheckBox; visible: true }
                 PropertyChanges { target: visibleRepostOfOwnCheckBox; visible: true }
@@ -54,6 +56,8 @@ Dialog {
             },
             State { // Notification
                 when: columnSettingDialog.componentType === 1
+                PropertyChanges { target: autoLoadingCheckbox; visible: true }
+                PropertyChanges { target: autoLoadingIntervalLayout; visible: true }
                 PropertyChanges { target: displayFrame; visible: true }
                 PropertyChanges { target: visibleLikeCheckBox; visible: true }
                 PropertyChanges { target: visibleRepostCheckBox; visible: true }
@@ -67,16 +71,22 @@ Dialog {
             },
             State { // SearchPosts
                 when: columnSettingDialog.componentType === 2
+                PropertyChanges { target: autoLoadingCheckbox; visible: true }
+                PropertyChanges { target: autoLoadingIntervalLayout; visible: true }
                 PropertyChanges { target: imageLayoutLabel; visible: true }
                 PropertyChanges { target: imageLayoutCombobox; visible: true }
             },
             State { // SearchProfiles
                 when: columnSettingDialog.componentType === 3
+                PropertyChanges { target: autoLoadingCheckbox; visible: true }
+                PropertyChanges { target: autoLoadingIntervalLayout; visible: true }
                 PropertyChanges { target: imageLayoutLabel; visible: false }
                 PropertyChanges { target: imageLayoutCombobox; visible: false }
             },
             State { // CustomFeed
                 when: columnSettingDialog.componentType === 4
+                PropertyChanges { target: autoLoadingCheckbox; visible: true }
+                PropertyChanges { target: autoLoadingIntervalLayout; visible: true }
                 PropertyChanges { target: imageLayoutLabel; visible: true }
                 PropertyChanges { target: imageLayoutCombobox; visible: true }
             },
@@ -87,6 +97,8 @@ Dialog {
             },
             State { // ListFeed
                 when: columnSettingDialog.componentType === 6
+                PropertyChanges { target: autoLoadingCheckbox; visible: true }
+                PropertyChanges { target: autoLoadingIntervalLayout; visible: true }
                 PropertyChanges { target: imageLayoutLabel; visible: true }
                 PropertyChanges { target: imageLayoutCombobox; visible: true }
             },

diff --git a/app/qml/parts/PostControls.qml b/app/qml/parts/PostControls.qml
@@ -19,6 +19,8 @@ RowLayout {
     property string handle: ""
     property bool mine: false
     property bool logMode: false
+    property int repostCount: 0
+    property int quoteCount: 0
 
     property alias replyButton: replyButton
     property alias repostButton: repostButton
@@ -34,6 +36,7 @@ RowLayout {
     signal triggeredRequestReport()
     signal triggeredRequestViewLikedBy()
     signal triggeredRequestViewRepostedBy()
+    signal triggeredRequestViewQuotes()
     signal triggeredRequestUpdateThreadGate()
     signal triggeredRequestPin()
     signal triggeredRequestMuteThread()
@@ -63,6 +66,7 @@ RowLayout {
         iconSize: AdjustedValues.i16
         foreground: isReposted ? Material.color(Material.Green) : Material.color(Material.Grey)
         flat: true
+        iconText: repostCount + (quoteCount > 0 ? "+" + quoteCount : "")
         onClicked: popup.open()
         MenuEx {
             id: popup
@@ -161,7 +165,7 @@ RowLayout {
             MenuSeparator {}
             Action {
                 text: qsTr("Reposted by")
-                enabled: repostButton.iconText > 0 && !logMode
+                enabled: repostCount > 0 && !logMode
                 icon.source: "../images/repost.png"
                 onTriggered: triggeredRequestViewRepostedBy()
             }
@@ -171,6 +175,12 @@ RowLayout {
                 icon.source: "../images/like.png"
                 onTriggered: triggeredRequestViewLikedBy()
             }
+            Action {
+                text: qsTr("Quotes")
+                enabled: quoteCount > 0 && !logMode
+                icon.source: "../images/quote.png"
+                onTriggered: triggeredRequestViewQuotes()
+            }
             MenuSeparator {}
             Action {
                 text: pinned ? qsTr("Unpin this post") : qsTr("Pin this post")
@@ -224,7 +234,7 @@ RowLayout {
             MenuSeparator {}
             Action {
                 text: qsTr("Reposted by")
-                enabled: repostButton.iconText > 0
+                enabled: repostCount > 0
                 icon.source: "../images/repost.png"
                 onTriggered: triggeredRequestViewRepostedBy()
             }
@@ -234,6 +244,12 @@ RowLayout {
                 icon.source: "../images/like.png"
                 onTriggered: triggeredRequestViewLikedBy()
             }
+            Action {
+                text: qsTr("Quotes")
+                enabled: quoteCount > 0
+                icon.source: "../images/quote.png"
+                onTriggered: triggeredRequestViewQuotes()
+            }
             MenuSeparator {}
             Action {
                 text: pinned ? qsTr("Unpin this post") : qsTr("Pin this post")

diff --git a/app/qml/parts/PostDelegate.qml b/app/qml/parts/PostDelegate.qml
@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
 import QtQuick.Controls.Material 2.15
 
 import tech.relog.hagoromo.singleton 1.0
+import tech.relog.hagoromo.timelinelistmodel 1.0
 
 import "../controls"
 
@@ -22,6 +23,7 @@ ClickableFrame {
     property bool hasQuote: false
     property bool threadConnected: false
     property bool logMode: false
+    property int quoteRecordStatus: TimelineListModel.QuoteRecordBlocked
 
     property alias moderationFrame: moderationFrame
     property alias repostReactionAuthor: repostReactionAuthor
@@ -269,8 +271,10 @@ ClickableFrame {
                         Layout.topMargin: 5
                         visible: false
                         Label {
+                            id: blockedQuoteFrameLabel
                             font.pointSize: AdjustedValues.f10
-                            text: qsTr("blocked")
+                            text: (postFrame.quoteRecordStatus === TimelineListModel.QuoteRecordDetached
+                                   ? qsTr("detached by author") : qsTr("blocked"))
                         }
                     }