limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-22 01:47:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert 0e2f8e9640

Browse source 
revert manual apply

Signed-off-by: limepotato <limepot@protonmail.ch>
This commit is contained in:
limepotato 2024-07-06 06:44:59 +02:00 committed by Iceshrimp development
parent 6ec4e431a1
commit 3b115aa71d
No known key found for this signature in database
GPG key ID: 7249C94AE229BEAF
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/client/src/components/MkInstanceTicker.vue
View file

@ -4,6 +4,7 @@
v-tooltip="capitalize(instance.softwareName)" v-tooltip="capitalize(instance.softwareName)"
ref="ticker" ref="ticker"
:style="bg" :style="bg"
@click.stop="os.pageWindow(instanceInfoUrl)"
> >
<img class="icon" :src="getInstanceIcon(instance)" aria-hidden="true" /> <img class="icon" :src="getInstanceIcon(instance)" aria-hidden="true" />
<span class="name">{{ instance.name }}</span> <span class="name">{{ instance.name }}</span>
@ -14,6 +15,7 @@
import { instanceName } from "@/config"; import { instanceName } from "@/config";
import { instance as Instance } from "@/instance"; import { instance as Instance } from "@/instance";
import { getProxiedImageUrlNullable } from "@/scripts/media-proxy"; import { getProxiedImageUrlNullable } from "@/scripts/media-proxy";
import * as os from "@/os";
const props = defineProps<{ const props = defineProps<{
instance?: { instance?: {

10
packages/client/src/components/MkNoteHeader.vue
View file

@ -41,7 +41,6 @@
class="ticker" class="ticker"
:instance="note.user.instance" :instance="note.user.instance"
:host="note.user.host" :host="note.user.host"
@click.stop="openServerInfo"
/> />
</div> </div>
</div> </div>
@ -57,12 +56,10 @@ import MkInstanceTicker from "@/components/MkInstanceTicker.vue";
import { notePage } from "@/filters/note"; import { notePage } from "@/filters/note";
import { userPage } from "@/filters/user"; import { userPage } from "@/filters/user";
import { i18n } from "@/i18n"; import { i18n } from "@/i18n";
import { pageWindow } from "@/os";
const props = defineProps<{ const props = defineProps<{
note: misskey.entities.Note; note: misskey.entities.Note;
pinned?: boolean; pinned?: boolean;
canOpenServerInfo?: boolean;
}>(); }>();
let note = $ref(props.note); let note = $ref(props.note);
@ -70,13 +67,6 @@ let note = $ref(props.note);
const showTicker = const showTicker =
defaultStore.state.instanceTicker === "always" || defaultStore.state.instanceTicker === "always" ||
(defaultStore.state.instanceTicker === "remote" && note.user.instance); (defaultStore.state.instanceTicker === "remote" && note.user.instance);
function openServerInfo() {
if (props.canOpenServerInfo && !defaultStore.state.openServerInfo || !note.value.user.instance) return;
const instanceInfoUrl =
props.host == null ? "/about" : `/instance-info/${note.value.user.instance}`;
pageWindow(instanceInfoUrl);
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>