Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
elliotBraem committed Dec 20, 2024
1 parent e5ce2b3 commit a99315e
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 23 deletions.
20 changes: 13 additions & 7 deletions backend/src/services/db/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,7 @@ export class DatabaseService {
}

try {
this.db.run(
`ALTER TABLE submissions ADD COLUMN categories TEXT`
);
this.db.run(`ALTER TABLE submissions ADD COLUMN categories TEXT`);
} catch (e) {
// Column might already exist
}
Expand Down Expand Up @@ -268,7 +266,9 @@ export class DatabaseService {
username: submission.username,
content: submission.content,
description: submission.description,
categories: submission.categories ? JSON.parse(submission.categories) : [],
categories: submission.categories
? JSON.parse(submission.categories)
: [],
status: submission.status,
acknowledgmentTweetId: submission.acknowledgment_tweet_id,
moderationResponseTweetId: submission.moderation_response_tweet_id,
Expand Down Expand Up @@ -315,7 +315,9 @@ export class DatabaseService {
username: submission.username,
content: submission.content,
description: submission.description,
categories: submission.categories ? JSON.parse(submission.categories) : [],
categories: submission.categories
? JSON.parse(submission.categories)
: [],
status: submission.status,
acknowledgmentTweetId: submission.acknowledgment_tweet_id,
moderationResponseTweetId: submission.moderation_response_tweet_id,
Expand Down Expand Up @@ -357,7 +359,9 @@ export class DatabaseService {
username: submission.username,
content: submission.content,
description: submission.description,
categories: submission.categories ? JSON.parse(submission.categories) : [],
categories: submission.categories
? JSON.parse(submission.categories)
: [],
status: submission.status,
acknowledgmentTweetId: submission.acknowledgment_tweet_id,
moderationResponseTweetId: submission.moderation_response_tweet_id,
Expand Down Expand Up @@ -404,7 +408,9 @@ export class DatabaseService {
username: submission.username,
content: submission.content,
description: submission.description,
categories: submission.categories ? JSON.parse(submission.categories) : [],
categories: submission.categories
? JSON.parse(submission.categories)
: [],
status: submission.status,
acknowledgmentTweetId: submission.acknowledgment_tweet_id,
moderationResponseTweetId: submission.moderation_response_tweet_id,
Expand Down
13 changes: 7 additions & 6 deletions backend/src/services/twitter/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -267,15 +267,16 @@ export class TwitterService {
}

// Extract categories from hashtags in submission tweet (excluding command hashtags)
const categories = (tweet.hashtags || []).filter(tag =>
!['submit', 'approve', 'reject'].includes(tag.toLowerCase())
const categories = (tweet.hashtags || []).filter(
(tag) => !["submit", "approve", "reject"].includes(tag.toLowerCase()),
);

// Extract description: everything after !submit @handle that's not a hashtag
const description = tweet.text
?.replace(/!submit\s+@\w+/i, '') // Remove command
.replace(/#\w+/g, '') // Remove hashtags
.trim() || undefined;
const description =
tweet.text
?.replace(/!submit\s+@\w+/i, "") // Remove command
.replace(/#\w+/g, "") // Remove hashtags
.trim() || undefined;

// Create submission using the original tweet's content and submission metadata
const submission: TwitterSubmission = {
Expand Down
21 changes: 11 additions & 10 deletions frontend/src/components/SubmissionList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -231,17 +231,18 @@ const SubmissionList = () => {
</p>
</div>
<div className="flex items-end gap-2 flex-col">
<a
href={getTweetUrl(
(submission.status === "pending" ? submission.acknowledgmentTweetId : submission.moderationResponseTweetId) || "",
BOT_ID
)}
target="_blank"
rel="noopener noreferrer"
>
<StatusBadge status={submission.status} />
<a
href={getTweetUrl(
(submission.status === "pending"
? submission.acknowledgmentTweetId
: submission.moderationResponseTweetId) || "",
BOT_ID,
)}
target="_blank"
rel="noopener noreferrer"
>
<StatusBadge status={submission.status} />
</a>

</div>
</div>

Expand Down

0 comments on commit a99315e

Please sign in to comment.