Ethan Lane
5ea8b72e54
All checks were successful
continuous-integration/drone/push Build is passing
# Description Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. - Add higher limit on the json result - This will fix the tests not always fetching an image from r/rabbits, as not every post in the top is a single image #125 ## Type of change Please delete options that are not relevant. - [x] Bug fix (non-breaking change which fixes an issue) # How Has This Been Tested? Please describe the tests that you ran to verify the changes. Provide instructions so we can reproduce. Please also list any relevant details to your test configuration. # Checklist - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that provde my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/random-bunny/pulls/139 Reviewed-by: VylpesTester <tester@vylpes.com> Co-authored-by: Ethan Lane <ethan@vylpes.com> Co-committed-by: Ethan Lane <ethan@vylpes.com>
104 lines
No EOL
2.8 KiB
TypeScript
104 lines
No EOL
2.8 KiB
TypeScript
import IReturnResult from "./contracts/IReturnResult";
|
|
import IRedditResult from "./contracts/IRedditResult";
|
|
import fetch from "got-cjs";
|
|
import { List } from 'linqts';
|
|
import IFetchResult from "./contracts/IFetchResult";
|
|
import { ErrorCode } from "./constants/ErrorCode";
|
|
import ErrorMessages from "./constants/ErrorMessages";
|
|
|
|
const sortable = [
|
|
'new',
|
|
'hot',
|
|
'top'
|
|
];
|
|
|
|
export default async function randomBunny(subreddit: string, sortBy: string = 'hot'): Promise<IReturnResult> {
|
|
if (!sortable.includes(sortBy)) sortBy = 'hot';
|
|
|
|
const result = await fetch(`https://reddit.com/r/${subreddit}/${sortBy}.json?limit=100`)
|
|
.then((res) => {
|
|
return res;
|
|
})
|
|
.catch(() => {
|
|
return null;
|
|
});
|
|
|
|
if (!result) {
|
|
return {
|
|
IsSuccess: false,
|
|
Query: {
|
|
subreddit: subreddit,
|
|
sortBy: sortBy,
|
|
},
|
|
Error: {
|
|
Code: ErrorCode.FailedToFetchReddit,
|
|
Message: ErrorMessages.FailedToFetchReddit,
|
|
},
|
|
}
|
|
}
|
|
|
|
const json = JSON.parse(result.body);
|
|
|
|
if (!json) {
|
|
return {
|
|
IsSuccess: false,
|
|
Query: {
|
|
subreddit: subreddit,
|
|
sortBy: sortBy,
|
|
},
|
|
Error: {
|
|
Code: ErrorCode.UnableToParseJSON,
|
|
Message: ErrorMessages.UnableToParseJSON,
|
|
},
|
|
}
|
|
}
|
|
|
|
const data: IFetchResult[] = json.data.children;
|
|
|
|
const dataWithImages = new List<IFetchResult>(data)
|
|
.Where(x => x!.data.url.includes('.jpg') || x!.data.url.includes('.png'))
|
|
.ToArray();
|
|
|
|
let random = 0;
|
|
|
|
if (dataWithImages.length == 0) {
|
|
return {
|
|
IsSuccess: false,
|
|
Query: {
|
|
subreddit: subreddit,
|
|
sortBy: sortBy,
|
|
},
|
|
Error: {
|
|
Code: ErrorCode.NoImageResultsFound,
|
|
Message: ErrorMessages.NoImageResultsFound,
|
|
},
|
|
};
|
|
} else {
|
|
random = Math.floor((Math.random() * (dataWithImages.length - 1)) + 0); // Between 0 and (size - 1)
|
|
}
|
|
|
|
const randomSelect = dataWithImages[random];
|
|
|
|
const randomData = randomSelect.data;
|
|
|
|
const redditResult: IRedditResult = {
|
|
Archived: randomData['archived'],
|
|
Downs: randomData['downs'],
|
|
Hidden: randomData['hidden'],
|
|
Permalink: randomData['permalink'],
|
|
Subreddit: randomData['subreddit'],
|
|
SubredditSubscribers: randomData['subreddit_subscribers'],
|
|
Title: randomData['title'],
|
|
Ups: randomData['ups'],
|
|
Url: randomData['url']
|
|
};
|
|
|
|
return {
|
|
IsSuccess: true,
|
|
Query: {
|
|
subreddit: subreddit,
|
|
sortBy: sortBy,
|
|
},
|
|
Result: redditResult
|
|
};
|
|
} |