Merge pull request #2835 from pixelfed/staging

Staging

CHANGELOG.md

@@ -36,6 +36,7 @@
 - Updated PublicApiController, improve network timeline perf. ([e5f683fd](https://github.com/pixelfed/pixelfed/commit/e5f683fd))
 - Updated Network Timeline, use existing Timeline component. ([0deaafc0](https://github.com/pixelfed/pixelfed/commit/0deaafc0))
 - Updated PostComponent, show like count to owner using MomentUI. ([e9c46bab](https://github.com/pixelfed/pixelfed/commit/e9c46bab))
+- Updated ContextMenu, add missing statusUrl method. ([3cffdb11](https://github.com/pixelfed/pixelfed/commit/3cffdb11))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)

public/mix-manifest.json

@@ -30,5 +30,5 @@
     "/js/status.js": "/js/status.js?id=bde5811432c2db213f0d",
     "/js/story-compose.js": "/js/story-compose.js?id=b16bcf2adad9651735e1",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=8842103833ba4861bcfa",
-    "/js/timeline.js": "/js/timeline.js?id=67c42aa27dac05a5e91c"
+    "/js/timeline.js": "/js/timeline.js?id=8f2f7924e8b7eefd656f"
 }

resources/assets/js/components/partials/ContextMenu.vue

@@ -583,6 +583,7 @@
 									swal('Success', 'Successfully marked account as spammer', 'success');
 									self.ctxModMenuClose();
 								}).catch(err => {
+									console.log(err);
 									self.ctxModMenuClose();
 									swal(
 										'Error',
@@ -617,6 +618,14 @@
 					swal('Error', 'Something went wrong, please try again later.', 'error');
 				});
 			},
+
+			statusUrl(status) {
+				if(status.local == true) {
+					return status.url;
+				}
+
+				return '/i/web/post/_/' + status.account.id + '/' + status.id;
+			}
 		}
 	}
 </script>