eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-12 16:50:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: generalize API library

Browse source
This commit is contained in:
spiral 2022-02-01 15:24:45 -05:00
parent 6d2fa78767
commit e74b5e1c13
No known key found for this signature in database
GPG key ID: A6059F0CA0E1BD31
26 changed files with 229 additions and 487 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/group/Body.svelte
View file

@ -2,12 +2,12 @@
import { Row, Col, Modal, Image, Button, CardBody, ModalHeader, ModalBody, ModalFooter, Spinner } from 'sveltestrap';
import moment from 'moment';
import { toHTML } from 'discord-markdown';
import type Group from '../../api/group';
import Edit from './Edit.svelte';
import twemoji from 'twemoji';
import Privacy from './Privacy.svelte';
import type Member from 'src/api/member';
import MemberEdit from './MemberEdit.svelte';
import { Member, Group } from '../../api/types';
export let group: Group;
let editMode: boolean = false;

12
src/lib/group/Edit.svelte
View file

@ -1,8 +1,8 @@
<script lang="ts">
import { Row, Col, Input, Button, Label, Alert, Spinner, Modal, ModalHeader, ModalBody } from 'sveltestrap';
import { createEventDispatcher } from 'svelte';
import Group from '../../api/group';
import PKAPI from '../../api';
import { Group } from '../../api/types';
import api from '../../api';
import autosize from 'svelte-autosize';
let loading: boolean = false;
@ -11,7 +11,7 @@
let err: string[] = [];
let input = new Group({name: group.name, display_name: group.display_name, banner: group.banner, color: group.color, icon: group.icon, description: group.description});
let input: Group = {...group};
const dispatch = createEventDispatcher();
@ -39,9 +39,8 @@
if (err.length > 0) return;
loading = true;
const api = new PKAPI();
try {
let res = await api.patchGroup({token: localStorage.getItem("pk-token"), id: group.id, data: data});
let res = await api().groups(group.id).patch({data});
group = {...group, ...res};
err = [];
update();
@ -74,9 +73,8 @@
return;
}
loading = true;
const api = new PKAPI();
try {
await api.deleteGroup({token: localStorage.getItem("pk-token"), id: group.id});
await api().groups(group.id).delete();
deleteErr = null;
toggleDeleteModal();
loading = false;

9
src/lib/group/List.svelte
View file

@ -4,15 +4,15 @@
import { onMount } from 'svelte';
import FaSearch from 'svelte-icons/fa/FaSearch.svelte'
import { useParams } from 'svelte-navigator';
import type Group from '../../api/group'
import type Member from '../../api/member'
import PKAPI from '../../api';
import CardsHeader from '../CardsHeader.svelte';
import ListPagination from '../ListPagination.svelte';
import Body from './Body.svelte';
import Svelecte, { addFormatter } from 'svelecte';
import FaLock from 'svelte-icons/fa/FaLock.svelte';
import { Member, Group } from '../../api/types';
import api from '../../api';
export let isPublic: boolean;
export let list: Group[];
@ -43,12 +43,11 @@
if (token || isPublic) fetchGroups();
});
const api = new PKAPI();
async function fetchGroups() {
listLoading = true;
try {
const res: Group[] = await api.getGroupList({token: !isPublic && token, id: isPublic && id, members: !isPublic ? true : false});
const res: Group[] = await api().systems(isPublic ? id : "@me").groups.get({ auth: !isPublic, query: { with_members: !isPublic } });
list = res;
listLoading = false;
} catch (error) {

12
src/lib/group/MemberEdit.svelte
View file

@ -1,9 +1,6 @@
<script lang="ts">
import type Group from "../../api/group";
import type Member from "../../api/member";
import { Row, Col, Button, Alert, ListGroup, ListGroupItem, Spinner } from 'sveltestrap';
import { createEventDispatcher } from 'svelte';
import PKAPI from '../../api';
import ListPagination from "../ListPagination.svelte";
import twemoji from "twemoji";
import FaUserPlus from 'svelte-icons/fa/FaUserPlus.svelte'
@ -11,6 +8,9 @@
import FaUserMinus from 'svelte-icons/fa/FaUserMinus.svelte'
import Svelecte, { addFormatter } from 'svelecte';
import { Group, Member } from '../../api/types';
import api from '../../api';
let loading: boolean = false;
let err: string;
export let group: Group;
@ -67,14 +67,12 @@ function memberListRenderer(item: any) {
function update() {
dispatch("update", group)
}
const api = new PKAPI();
async function submitAdd() {
let data = membersToBeAdded;
try {
loading = true;
await api.postGroupMembers({token: localStorage.getItem("pk-token"), id: group.id, data: data, removing: false});
await api().groups(group.id).members.add.post({data});
data.forEach(member => group.members.push(member));
update();
err = null;
@ -91,7 +89,7 @@ function memberListRenderer(item: any) {
let data = membersToBeRemoved;
try {
loading = true;
await api.postGroupMembers({token: localStorage.getItem("pk-token"), id: group.id, data: data, removing: true});
await api().groups(group.id).members.remove.post({data});
group.members = group.members.filter(m => !data.includes(m));
update();
err = null;

10
src/lib/group/Privacy.svelte
View file

@ -1,9 +1,10 @@
<script lang="ts">
import Group from "../../api/group";
import PKAPI from "../../api";
import { createEventDispatcher } from "svelte";
import { ModalBody, ModalHeader, Col, Row, Input, Label, ModalFooter, Button, Spinner, Alert } from "sveltestrap";
import { Group } from '../../api/types';
import api from '../../api';
export let privacyOpen: boolean;
export let group: Group;
const togglePrivacyModal = () => (privacyOpen = !privacyOpen);
@ -30,16 +31,15 @@
dispatch('update', group);
}
let input = new Group({privacy: group.privacy});
let input: Group = {privacy: group.privacy};
async function submit() {
let data = input;
err = null;
loading = true;
const api = new PKAPI();
try {
let res = await api.patchGroup({token: localStorage.getItem("pk-token"), id: group.id, data: data});
let res = await api().groups(group.id).patch({data});
group = res;
update();
loading = false;

4
src/lib/member/Body.svelte
View file

@ -4,13 +4,13 @@
import { toHTML } from 'discord-markdown';
import twemoji from 'twemoji';
import type Member from '../../api/member';
import type Group from '../../api/group';
import GroupEdit from './GroupEdit.svelte';
import Edit from './Edit.svelte';
import Privacy from './Privacy.svelte';
import ProxyTags from './ProxyTags.svelte';
import { Member, Group } from '../../api/types';
export let groups: Group[] = [];
export let member: Member;
export let isPublic: boolean = false;

12
src/lib/member/Edit.svelte
View file

@ -4,8 +4,8 @@
import autosize from 'svelte-autosize';
import moment from 'moment';
import Member from '../../api/member';
import PKAPI from '../../api';
import { Member } from '../../api/types'
import api from '../../api';
let loading: boolean = false;
export let member: Member;
@ -13,7 +13,7 @@
let err: string[] = [];
let input = new Member({name: member.name, display_name: member.display_name, birthday: member.birthday, pronouns: member.pronouns, color: member.color, description: member.description, banner: member.banner, avatar_url: member.avatar_url});
let input: Member = {...member};
const dispatch = createEventDispatcher();
@ -54,9 +54,8 @@
if (err.length > 0) return;
loading = true;
const api = new PKAPI();
try {
let res = await api.patchMember({token: localStorage.getItem("pk-token"), id: member.id, data: data});
let res = await api().members(member.id).patch({data});
member = res;
err = [];
update();
@ -89,9 +88,8 @@
return;
}
loading = true;
const api = new PKAPI();
try {
await api.deleteMember({token: localStorage.getItem("pk-token"), id: member.id});
await api().members(member.id).delete();
deleteErr = null;
toggleDeleteModal();
loading = false;

12
src/lib/member/GroupEdit.svelte
View file

@ -1,9 +1,6 @@
<script lang="ts">
import type Group from "../../api/group";
import type Member from "../../api/member";
import { Row, Col, Button, Alert, ListGroup, ListGroupItem, Spinner } from 'sveltestrap';
import { createEventDispatcher } from 'svelte';
import PKAPI from '../../api';
import ListPagination from "../ListPagination.svelte";
import twemoji from "twemoji";
import Svelecte, { addFormatter } from 'svelecte';
@ -13,6 +10,9 @@
import FaFolderPlus from 'svelte-icons/fa/FaFolderPlus.svelte'
import FaFolderMinus from 'svelte-icons/fa/FaFolderMinus.svelte'
import { Member, Group } from '../../api/types';
import api from '../../api';
export let member: Member;
export let groups: Group[] = [];
let loading: boolean = false;
@ -69,13 +69,11 @@
dispatch("updateGroups", groups);
}
const api = new PKAPI();
async function submitAdd() {
let data = groupsToBeAdded;
try {
loading = true;
await api.postMemberGroups({token: localStorage.getItem("pk-token"), id: member.id, data: data, removing: false});
await api().members(member.id).groups.add.post({data});
groups.forEach(group => data.includes(group.uuid) && group.members.push(member.uuid));
updateGroups();
err = null;
@ -92,7 +90,7 @@
let data = groupsToBeRemoved;
try {
loading = true;
await api.postMemberGroups({token: localStorage.getItem("pk-token"), id: member.id, data: data, removing: true});
await api().members(member.id).groups.remove.post({data});
groups.forEach(group => {if (data.includes(group.uuid)) group.members = group.members.filter(m => m !== member.uuid)});
updateGroups();
err = null;

10
src/lib/member/List.svelte
View file

@ -4,15 +4,15 @@
import { onMount } from 'svelte';
import FaSearch from 'svelte-icons/fa/FaSearch.svelte'
import { useParams } from 'svelte-navigator';
import type Member from '../../api/member';
import type Group from '../../api/group'
import PKAPI from '../../api';
import CardsHeader from '../CardsHeader.svelte';
import ListPagination from '../ListPagination.svelte';
import Svelecte, { addFormatter } from 'svelecte';
import FaLock from 'svelte-icons/fa/FaLock.svelte';
import Body from './Body.svelte';
import { Member, Group } from '../../api/types';
import api from '../../api';
export let isPublic: boolean;
export let list: Member[] = [];
@ -43,12 +43,10 @@
if (token || isPublic) fetchMembers();
});
const api = new PKAPI();
async function fetchMembers() {
listLoading = true;
try {
const res: Member[] = await api.getMemberList({token: !isPublic && token, id: isPublic && id});
const res: Member[] = await api().systems(isPublic ? id : "@me").members.get({ auth: !isPublic });
list = res;
listLoading = false;
} catch (error) {

10
src/lib/member/Privacy.svelte
View file

@ -1,9 +1,10 @@
<script lang="ts">
import Member from "../../api/member";
import PKAPI from "../../api";
import { createEventDispatcher } from "svelte";
import { Col, Row, Input, Label, Button, Alert, Spinner } from "sveltestrap";
import { Member } from '../../api/types';
import api from '../../api';
let loading: boolean;
export let privacyOpen: boolean;
export let member: Member;
@ -33,16 +34,15 @@
dispatch('update', member);
}
let input = new Member({privacy: member.privacy});
let input: Member = {privacy: member.privacy};
async function submit() {
let data = input;
err = null;
loading = true;
const api = new PKAPI();
try {
let res = await api.patchMember({token: localStorage.getItem("pk-token"), id: member.id, data: data});
let res = await api().members(member.id).patch({data});
member = res;
update();
loading = false;

10
src/lib/member/ProxyTags.svelte
View file

@ -1,9 +1,10 @@
<script lang="ts">
import Member from "../../api/member";
import PKAPI from "../../api";
import { createEventDispatcher } from "svelte";
import { Col, Row, Input, Label, Button, Alert, Spinner, InputGroup } from "sveltestrap";
import { Member } from '../../api/types';
import api from '../../api';
let loading: boolean;
export let proxyOpen: boolean;
export let member: Member;
@ -26,12 +27,11 @@
return;
}
let data = new Member({proxy_tags: input});
const api = new PKAPI();
let data: Member = {proxy_tags: input};
loading = true;
try {
let res = await api.patchMember({token: localStorage.getItem("pk-token"), data: data, id: member.id});
let res = await api().members(member.id).patch({data});
member = res;
err = null;
update();

5
src/lib/system/Body.svelte
View file

@ -2,10 +2,11 @@
import { Row, Col, Modal, Image, Button } from 'sveltestrap';
import moment from 'moment';
import { toHTML } from 'discord-markdown';
import type Sys from '../../api/system';
import twemoji from 'twemoji';
import { System } from '../../api/types';
export let user: Sys;
export let user: System;
export let editMode: boolean;
export let isPublic: boolean;

12
src/lib/system/Edit.svelte
View file

@ -1,18 +1,19 @@
<script lang="ts">
import { Row, Col, Input, Button, Label, Alert } from 'sveltestrap';
import Sys from '../../api/system';
import PKAPI from '../../api';
import autosize from 'svelte-autosize';
// import moment from 'moment-timezone';
import { currentUser } from '../../stores';
import { System } from '../../api/types';
import api from '../../api';
export let editMode: boolean;
export let user: Sys;
export let user: System;
export let loading: boolean;
let err: string[] = [];
let input = new Sys({name: user.name, tag: user.tag, color: user.color, avatar_url: user.avatar_url, banner: user.banner, description: user.description});
let input: System = {...user};
async function submit() {
let data = input;
@ -34,9 +35,8 @@
if (err.length > 0) return;
loading = true;
const api = new PKAPI();
try {
let res = await api.patchSystem({token: localStorage.getItem("pk-token"), data: data});
let res = await api().systems("@me").patch({data});
user = res;
currentUser.update(() => res);
err = [];

5
src/lib/system/Main.svelte
View file

@ -5,9 +5,10 @@
import Body from './Body.svelte';
import Privacy from './Privacy.svelte';
import Edit from './Edit.svelte';
import type Sys from '../../api/system';
export let user: Sys;
import { System } from '../../api/types';
export let user: System;
export let isPublic = true;
let loading = false;

5
src/lib/system/Privacy.svelte
View file

@ -1,10 +1,11 @@
<script lang="ts">
import { Card, CardHeader, CardBody, CardTitle, Row, Col, Button, Spinner } from 'sveltestrap';
import FaUserLock from 'svelte-icons/fa/FaUserLock.svelte';
import type Sys from '../../api/system';
import PrivacyEdit from './PrivacyEdit.svelte';
export let user: Sys;
import { System } from '../../api/types';
export let user: System;
let editMode = false;
let loading: boolean;

12
src/lib/system/PrivacyEdit.svelte
View file

@ -1,25 +1,25 @@
<script lang="ts">
import Sys from '../../api/system';
import { Input, Row, Col, Button, Label, Alert } from 'sveltestrap';
import { currentUser } from '../../stores';
import PKAPI from '../../api';
import { System } from '../../api/types';
import api from '../../api';
export let loading = false;
export let user: Sys;
export let user: System;
export let editMode: boolean;
let err: string;
let input = new Sys({privacy: user.privacy});
let input: System = {privacy: user.privacy};
async function submit() {
let data = input;
err = null;
loading = true;
const api = new PKAPI();
try {
let res = await api.patchSystem({token: localStorage.getItem("pk-token"), data: data});
let res = await api().systems("@me").patch({data});
user = res;
currentUser.update(() => res);
editMode = false;