UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-29 09:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update DirectMessageController

Browse source
This commit is contained in:
Daniel Supernault 2020-11-18 19:51:08 -07:00
parent fa8fbb7e86
commit 4b90b1e0df
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/DirectMessageController.php
View file

@ -307,6 +307,7 @@ class DirectMessageController extends Controller
'media' => $s->status->firstMedia() ? $s->status->firstMedia()->url() : null, 'media' => $s->status->firstMedia() ? $s->status->firstMedia()->url() : null,
'timeAgo' => $s->created_at->diffForHumans(null,null,true), 'timeAgo' => $s->created_at->diffForHumans(null,null,true),
'seen' => $s->read_at != null, 'seen' => $s->read_at != null,
'reportId' => (string) $s->status_id,
'meta' => json_decode($s->meta,true) 'meta' => json_decode($s->meta,true)
]; ];
}); });
@ -589,7 +590,7 @@ class DirectMessageController extends Controller
{ {
$profile = $dm->author; $profile = $dm->author;
$url = $dm->recipient->inbox_url; $url = $dm->recipient->inbox_url;
$body = [ $body = [
'@context' => [ '@context' => [
'https://www.w3.org/ns/activitystreams', 'https://www.w3.org/ns/activitystreams',

35
resources/assets/js/components/DirectMessage.vue
View file

@ -378,6 +378,14 @@
objDiv.scrollTop = objDiv.scrollHeight; objDiv.scrollTop = objDiv.scrollHeight;
}, 300); }, 300);
}); });
let options = localStorage.getItem('px_dm_options');
if(options) {
options = JSON.parse(options);
this.hideAvatars = options.hideAvatars;
this.hideTimestamps = options.hideTimestamps;
this.largerText = options.largerText;
}
}, },
watch: { watch: {
@ -397,6 +405,21 @@
} }
this.mutedNotifications = v; this.mutedNotifications = v;
}, },
hideAvatars: function(v) {
this.hideAvatars = v;
this.updateOptions();
},
hideTimestamps: function(v) {
this.hideTimestamps = v;
this.updateOptions();
},
largerText: function(v) {
this.largerText = v;
this.updateOptions();
},
}, },
updated() { updated() {
@ -470,7 +493,7 @@
reportMessage() { reportMessage() {
this.closeCtxMenu(); this.closeCtxMenu();
let url = '/i/report?type=post&id=' + this.ctxContext.id; let url = '/i/report?type=post&id=' + this.ctxContext.reportId;
window.location.href = url; window.location.href = url;
return; return;
}, },
@ -642,6 +665,16 @@
showOptions() { showOptions() {
this.page = 'options'; this.page = 'options';
},
updateOptions() {
let options = {
v: 1,
hideAvatars: this.hideAvatars,
hideTimestamps: this.hideTimestamps,
largerText: this.largerText
}
window.localStorage.setItem('px_dm_options', JSON.stringify(options));
} }
} }
} }