oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

enhance: RSSウィジェット / RSSティッカーウィジェットをいい感じにする (#9469)

Browse source 
* ✌️

* use useInterval

* ✌️

* rawItems.value.length !== 0

* fix

* https://github.com/misskey-dev/misskey/pull/9469#discussion_r1061763613
This commit is contained in:
tamaina 2023-01-05 03:28:25 +09:00 • committed by GitHub
parent f51220a5bf
commit b1a75177a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 159 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

88
packages/frontend/src/widgets/rss.vue
View file

@ -5,19 +5,24 @@
<div class="ekmkgxbj">
<MkLoading v-if="fetching"/>
<div v-else class="feed">
<a v-for="item in items" class="item" :href="item.link" rel="nofollow noopener" target="_blank" :title="item.title">{{ item.title }}</a>
<div class="_fullinfo" v-else-if="(!items || items.length === 0) && widgetProps.showHeader">
<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
<div>{{ i18n.ts.nothing }}</div>
</div>
<div v-else :class="$style.feed">
<a v-for="item in items" :class="$style.item" :href="item.link" :key="item.link" rel="nofollow noopener" target="_blank" :title="item.title">{{ item.title }}</a>
</div>
</div>
</MkContainer>
</template>
<script lang="ts" setup>
import { onMounted, onUnmounted, ref, watch } from 'vue';
import { ref, watch, computed } from 'vue';
import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
import { GetFormResultType } from '@/scripts/form';
import * as os from '@/os';
import MkContainer from '@/components/MkContainer.vue';
import { url as base } from '@/config';
import { i18n } from '@/i18n';
import { useInterval } from '@/scripts/use-interval';
const name = 'rss';
@ -27,6 +32,14 @@ const widgetPropsDef = {
type: 'string' as const,
default: 'http://feeds.afpbb.com/rss/afpbb/afpbbnews',
},
refreshIntervalSec: {
type: 'number' as const,
default: 60,
},
maxEntries: {
type: 'number' as const,
default: 15,
},
showHeader: {
type: 'boolean' as const,
default: true,
@ -47,24 +60,37 @@ const { widgetProps, configure } = useWidgetPropsManager(name,
emit,
);
const items = ref([]);
const rawItems = ref([]);
const items = computed(() => rawItems.value.slice(0, widgetProps.maxEntries));
const fetching = ref(true);
const fetchEndpoint = computed(() => {
const url = new URL('/api/fetch-rss', base);
url.searchParams.set('url', widgetProps.url);
return url;
});
let intervalClear = $ref<(() => void) | undefined>();
const tick = () => {
window.fetch(`/api/fetch-rss?url=${widgetProps.url}`, {}).then(res => {
res.json().then(feed => {
items.value = feed.items;
fetching.value = false;
});
if (document.visibilityState === 'hidden' && rawItems.value.length !== 0) return;
window.fetch(fetchEndpoint.value, {})
.then(res => res.json())
.then(feed => {
rawItems.value = feed.items ?? [];
fetching.value = false;
});
};
watch(() => widgetProps.url, tick);
useInterval(tick, 60000, {
immediate: true,
afterMounted: true,
});
watch(() => fetchEndpoint, tick);
watch(() => widgetProps.refreshIntervalSec, () => {
if (intervalClear) {
intervalClear();
}
intervalClear = useInterval(tick, Math.max(10000, widgetProps.refreshIntervalSec * 1000), {
immediate: true,
afterMounted: true,
});
}, { immediate: true });
defineExpose<WidgetComponentExpose>({
name,
@ -73,24 +99,22 @@ defineExpose<WidgetComponentExpose>({
});
</script>
<style lang="scss" scoped>
.ekmkgxbj {
> .feed {
padding: 0;
font-size: 0.9em;
<style lang="scss" module>
.feed {
padding: 0;
font-size: 0.9em;
}
> .item {
display: block;
padding: 8px 16px;
color: var(--fg);
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
.item {
display: block;
padding: 8px 16px;
color: var(--fg);
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
&:nth-child(even) {
background: rgba(#000, 0.05);
}
}
&:nth-child(even) {
background: rgba(#000, 0.05);
}
}
</style>