limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-25 19:37:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of codeberg.org:calckey/calckey into develop

Browse source
This commit is contained in:
ThatOneCalculator 2023-07-12 23:09:44 -07:00
commit 9a5dd95998
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
locales/gl.yml Normal file
View file

@ -0,0 +1 @@
{}

2
packages/backend/src/queue/processors/db/import-masto-post.ts
View file

@ -50,7 +50,7 @@ export async function importMastoPost(
text: text || undefined, text: text || undefined,
reply, reply,
renote: null, renote: null,
cw: post.sensitive, cw: post.object.sensitive ? post.object.summary : undefined,
localOnly: false, localOnly: false,
visibility: "hidden", visibility: "hidden",
visibleUsers: [], visibleUsers: [],

2
packages/backend/src/server/api/stream/index.ts
View file

@ -247,7 +247,7 @@ export default class Connection {
for (const obj of objs) { for (const obj of objs) {
const { type, body } = obj; const { type, body } = obj;
console.log(type, body); // console.log(type, body);
switch (type) { switch (type) {
case "readNotification": case "readNotification":
this.onReadNotification(body); this.onReadNotification(body);

2
packages/client/src/components/global/MkEmoji.vue
View file

@ -69,7 +69,7 @@ const alt = computed(() =>
vertical-align: -0.25em; vertical-align: -0.25em;
&.custom { &.custom {
height: 2.5em; height: 2em;
vertical-align: middle; vertical-align: middle;
transition: transform 0.2s ease; transition: transform 0.2s ease;