Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-28 10:19:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: #12935, show 'shared this to x' in topic event when moving topics out of cid -1

Browse Source
This commit is contained in:
Julian Lam
2024-12-11 13:07:46 -05:00
parent 050acb4f85
commit fcf0f79987
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/language/en-GB/topic.json
View File

@@ -66,6 +66,8 @@
"user-restored-topic-on": "%1 restored this topic on %2", "user-restored-topic-on": "%1 restored this topic on %2",
"user-moved-topic-from-ago": "%1 moved this topic from %2 %3", "user-moved-topic-from-ago": "%1 moved this topic from %2 %3",
"user-moved-topic-from-on": "%1 moved this topic from %2 on %3", "user-moved-topic-from-on": "%1 moved this topic from %2 on %3",
"user-shared-topic-ago": "%1 shared this topic %2",
"user-shared-topic-on": "%1 shared this topic on %2",
"user-queued-post-ago": "%1 <a href=\"%2\">queued</a> post for approval %3", "user-queued-post-ago": "%1 <a href=\"%2\">queued</a> post for approval %3",
"user-queued-post-on": "%1 <a href=\"%2\">queued</a> post for approval on %3", "user-queued-post-on": "%1 <a href=\"%2\">queued</a> post for approval on %3",
"user-referenced-topic-ago": "%1 <a href=\"%2\">referenced</a> this topic %3", "user-referenced-topic-ago": "%1 <a href=\"%2\">referenced</a> this topic %3",

4
src/topics/events.js
View File

@@ -56,6 +56,10 @@ Events._types = {
icon: 'fa-arrow-circle-right', icon: 'fa-arrow-circle-right',
translation: async (event, language) => translateEventArgs(event, language, 'topic:user-moved-topic-from', renderUser(event), `${event.fromCategory.name}`, renderTimeago(event)), translation: async (event, language) => translateEventArgs(event, language, 'topic:user-moved-topic-from', renderUser(event), `${event.fromCategory.name}`, renderTimeago(event)),
}, },
share: {
icon: 'fa-share-alt',
translation: async (event, language) => translateEventArgs(event, language, 'topic:user-shared-topic', renderUser(event), renderTimeago(event)),
},
'post-queue': { 'post-queue': {
icon: 'fa-history', icon: 'fa-history',
translation: async (event, language) => translateEventArgs(event, language, 'topic:user-queued-post', renderUser(event), `${relative_path}${event.href}`, renderTimeago(event)), translation: async (event, language) => translateEventArgs(event, language, 'topic:user-queued-post', renderUser(event), `${relative_path}${event.href}`, renderTimeago(event)),

2
src/topics/tools.js
View File

@@ -283,7 +283,7 @@ module.exports = function (Topics) {
oldCid: oldCid, oldCid: oldCid,
}), }),
Topics.updateCategoryTagsCount([oldCid, cid], tags), Topics.updateCategoryTagsCount([oldCid, cid], tags),
Topics.events.log(tid, { type: 'move', uid: data.uid, fromCid: oldCid }), Topics.events.log(tid, { type: oldCid === -1 ? 'share' : 'move', uid: data.uid, fromCid: oldCid }),
]); ]);
// Update entry in recent topics zset — must come after hash update // Update entry in recent topics zset — must come after hash update