Merge branch 'develop' of https://codeberg.org/calckey/calckey into logged-out

This commit is contained in:
freeplay 2023-07-05 21:13:07 -04:00
commit f4730f43f2
8 changed files with 271 additions and 261 deletions

File diff suppressed because it is too large Load diff

View file

@ -33,7 +33,7 @@ export async function endedPollNotification(
} }
// Broadcast the poll result once it ends // Broadcast the poll result once it ends
await deliverQuestionUpdate(note.id); if (!note.localOnly) await deliverQuestionUpdate(note.id);
done(); done();
} }

View file

@ -103,7 +103,7 @@ const plyrMini = ref(false);
const url = const url =
props.raw || defaultStore.state.loadRawImages props.raw || defaultStore.state.loadRawImages
? props.media.url ? props.media.url
: defaultStore.state.disableShowingAnimatedImages : defaultStore.state.disableShowingAnimatedImages && props.media.type.startsWith('image')
? getStaticImageUrl(props.media.thumbnailUrl) ? getStaticImageUrl(props.media.thumbnailUrl)
: props.media.thumbnailUrl; : props.media.thumbnailUrl;
@ -178,6 +178,8 @@ onMounted(() => {
position: relative; position: relative;
background: var(--bg); background: var(--bg);
--plyr-color-main: var(--accent);
> .buttons { > .buttons {
display: flex; display: flex;
gap: 4px; gap: 4px;

View file

@ -128,8 +128,8 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="detailedView" class="info"> <div v-if="detailedView || (appearNote.channel && !inChannel)" class="info">
<MkA class="created-at" :to="notePage(appearNote)"> <MkA v-if="detailedView" class="created-at" :to="notePage(appearNote)">
<MkTime :time="appearNote.createdAt" mode="absolute" /> <MkTime :time="appearNote.createdAt" mode="absolute" />
</MkA> </MkA>
<MkA <MkA
@ -137,7 +137,7 @@
class="channel" class="channel"
:to="`/channels/${appearNote.channel.id}`" :to="`/channels/${appearNote.channel.id}`"
@click.stop @click.stop
><i class="ph-television ph-bold ph-lg"></i> ><i class="ph-television ph-bold"></i>
{{ appearNote.channel.name }}</MkA {{ appearNote.channel.name }}</MkA
> >
</div> </div>

View file

@ -23,7 +23,7 @@
</FormSplit> </FormSplit>
</div> </div>
<div <div
v-if="username != '' || host != ''" v-if="username != ''"
class="result" class="result"
:class="{ hit: users.length > 0 }" :class="{ hit: users.length > 0 }"
> >
@ -54,7 +54,7 @@
<span>{{ i18n.ts.noUsers }}</span> <span>{{ i18n.ts.noUsers }}</span>
</div> </div>
</div> </div>
<div v-if="username == '' && host == ''" class="recent"> <div v-if="username == ''" class="recent">
<div class="users"> <div class="users">
<div <div
v-for="user in recentUsers" v-for="user in recentUsers"
@ -100,20 +100,19 @@ const emit = defineEmits<{
}>(); }>();
let username = $ref(""); let username = $ref("");
let host = $ref("");
let users: misskey.entities.UserDetailed[] = $ref([]); let users: misskey.entities.UserDetailed[] = $ref([]);
let recentUsers: misskey.entities.UserDetailed[] = $ref([]); let recentUsers: misskey.entities.UserDetailed[] = $ref([]);
let selected: misskey.entities.UserDetailed | null = $ref(null); let selected: misskey.entities.UserDetailed | null = $ref(null);
let dialogEl = $ref(); let dialogEl = $ref();
const search = () => { const search = () => {
if (username === "" && host === "") { if (username === "") {
users = []; users = [];
return; return;
} }
os.api("users/search-by-username-and-host", { os.api("users/search", {
username: username, query: username,
host: null, origin: "local",
limit: 10, limit: 10,
detail: false, detail: false,
}).then((_users) => { }).then((_users) => {

View file

@ -2,8 +2,9 @@
<component <component
:is="self ? 'MkA' : 'a'" :is="self ? 'MkA' : 'a'"
ref="el" ref="el"
class="ieqqeuvs _link" class="ieqqeuvs url _link"
:[attr]="self ? props.url.substring(local.length) : props.url" :[attr]="self ? props.url.substring(local.length) : props.url"
:title="self ? props.url.substring(local.length) : props.url"
:rel="rel" :rel="rel"
:target="target" :target="target"
@contextmenu.stop="() => {}" @contextmenu.stop="() => {}"
@ -73,8 +74,12 @@ const target = self ? null : "_blank";
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.ieqqeuvs { .url {
word-break: break-all; white-space: nowrap;
max-width: 80%;
display: inline-block;
overflow: clip;
text-overflow: ellipsis;
> .icon { > .icon {
padding-left: 2px; padding-left: 2px;

View file

@ -53,6 +53,9 @@ html {
sans-serif; sans-serif;
} }
} }
* {
scrollbar-color: var(--scrollbarHandle) transparent;
}
body::-webkit-scrollbar { body::-webkit-scrollbar {
width: 12px; width: 12px;
height: 12px; height: 12px;

View file

@ -81,6 +81,7 @@
"@octofloofy@ck.octofloofy.ink", "@octofloofy@ck.octofloofy.ink",
"@pauliehedron@infosec.town", "@pauliehedron@infosec.town",
"@soulthunk@lethallava.land", "@soulthunk@lethallava.land",
"@bumble@ibe.social",
"\nInterkosmos Link" "\nInterkosmos Link"
] ]
} }