Merge branch 'frogpond-news' into frogpond-data

* frogpond-news:
  remove fetch-feed and move news sources to ccc-server
  add support for disabling thumbnails on the news views

Author: hawkrives

source/views/news/fetch-feed.js

@@ -12,12 +12,10 @@ const NewsView = TabNavigator({
 	StOlafNewsView: {
 		screen: ({navigation}) => (
 			<NewsContainer
-				mode="wp-json"
-				name="St. Olaf"
 				navigation={navigation}
-				query={{per_page: 10, _embed: true}}
+				source="stolaf"
 				thumbnail={newsImages.stolaf}
-				url="https://wp.stolaf.edu/wp-json/wp/v2/posts"
+				title="St. Olaf"
 			/>
 		),
 		navigationOptions: {
@@ -29,12 +27,10 @@ const NewsView = TabNavigator({
 	OlevilleNewsView: {
 		screen: ({navigation}) => (
 			<NewsContainer
-				mode="wp-json"
-				name="Oleville"
 				navigation={navigation}
-				query={{per_page: 10, _embed: true}}
+				source="oleville"
 				thumbnail={newsImages.oleville}
-				url="https://oleville.com/wp-json/wp/v2/posts/"
+				title="Oleville"
 			/>
 		),
 		navigationOptions: {
@@ -46,12 +42,10 @@ const NewsView = TabNavigator({
 	MessNewsView: {
 		screen: ({navigation}) => (
 			<NewsContainer
-				mode="wp-json"
-				name="The Mess"
 				navigation={navigation}
-				query={{per_page: 10, _embed: true}}
+				source="mess"
 				thumbnail={newsImages.mess}
-				url="https://www.manitoumessenger.com/wp-json/wp/v2/posts/"
+				title="The Mess"
 			/>
 		),
 		navigationOptions: {
@@ -63,11 +57,10 @@ const NewsView = TabNavigator({
 	PoliticOleNewsView: {
 		screen: ({navigation}) => (
 			<NewsContainer
-				mode="rss"
-				name="PoliticOle"
 				navigation={navigation}
+				source="politicole"
 				thumbnail={newsImages.politicole}
-				url="https://oleville.com/politicole/feed/"
+				title="PoliticOle"
 			/>
 		),
 		navigationOptions: {
@@ -79,12 +72,10 @@ const NewsView = TabNavigator({
 	KstoNewsView: {
 		screen: ({navigation}) => (
 			<NewsContainer
-				mode="wp-json"
-				name="KSTO"
 				navigation={navigation}
-				query={{per_page: 10, _embed: true}}
+				source="ksto"
 				thumbnail={newsImages.ksto}
-				url="https://pages.stolaf.edu/ksto/wp-json/wp/v2/posts/"
+				title="KSTO"
 			/>
 		),
 		navigationOptions: {

source/views/news/index.js

@@ -5,17 +5,14 @@ import type {StoryType} from './types'
 import LoadingView from '../components/loading'
 import {NoticeView} from '../components/notice'
 import type {TopLevelViewPropsType} from '../types'
-import {tracker} from '../../analytics'
 import {reportNetworkProblem} from '../../lib/report-network-problem'
 import {NewsList} from './news-list'
-import {fetchRssFeed, fetchWpJson} from './fetch-feed'
+import {API} from '../../globals'
 
 type Props = TopLevelViewPropsType & {
-	name: string,
-	url: string,
-	query?: Object,
-	mode: 'rss' | 'wp-json',
-	thumbnail: number,
+	source: string | {url: string, type: 'rss' | 'wp-json'},
+	thumbnail: false | number,
+	title: string,
 }
 
 type State = {
@@ -40,29 +37,22 @@ export default class NewsContainer extends React.PureComponent<Props, State> {
 
 	fetchData = async () => {
 		try {
-			let entries: StoryType[] = []
-
-			if (this.props.mode === 'rss') {
-				entries = await fetchRssFeed(this.props.url, this.props.query)
-			} else if (this.props.mode === 'wp-json') {
-				entries = await fetchWpJson(this.props.url, this.props.query)
+			let url
+			if (typeof this.props.source === 'string') {
+				url = API(`/news/named/${this.props.source}`)
+			} else if (this.props.source.type === 'rss') {
+				url = API('/news/rss', {url: this.props.source.url})
+			} else if (this.props.source.type === 'wp-json') {
+				url = API('/news/wpjson', {url: this.props.source.url})
 			} else {
-				throw new Error(`unknown mode ${this.props.mode}`)
+				throw new Error('invalid news source type!')
 			}
 
+			let entries: StoryType[] = await fetchJson(url)
 			this.setState(() => ({entries}))
 		} catch (error) {
-			if (error.message.startsWith('Unexpected token <')) {
-				tracker.trackEvent('news', 'St. Olaf WPDefender strikes again')
-				this.setState(() => ({
-					error: new Error(
-						"Oops. Looks like we've triggered a St. Olaf website defense mechanism. Try again in 5 minutes.",
-					),
-				}))
-			} else {
-				reportNetworkProblem(error)
-				this.setState(() => ({error}))
-			}
+			reportNetworkProblem(error)
+			this.setState(() => ({error}))
 		}
 	}
 
@@ -93,8 +83,7 @@ export default class NewsContainer extends React.PureComponent<Props, State> {
 			<NewsList
 				entries={this.state.entries}
 				loading={this.state.refreshing}
-				mode={this.props.mode}
-				name={this.props.name}
+				name={this.props.title}
 				navigation={this.props.navigation}
 				onRefresh={this.refresh}
 				thumbnail={this.props.thumbnail}

source/views/news/news-container.js

@@ -20,15 +20,19 @@ type Props = TopLevelViewPropsType & {
 	onRefresh: () => any,
 	entries: StoryType[],
 	loading: boolean,
-	thumbnail: number,
+	thumbnail: false | number,
 }
 
 export class NewsList extends React.PureComponent<Props> {
 	onPressNews = (url: string) => {
 		return openUrl(url)
 	}
 
-	renderSeparator = () => <ListSeparator spacing={{left: 101}} />
+	renderSeparator = () => (
+		<ListSeparator
+			spacing={{left: this.props.thumbnail === false ? undefined : 101}}
+		/>
+	)
 
 	renderItem = ({item}: {item: StoryType}) => (
 		<NewsRow

source/views/news/news-list.js

@@ -9,7 +9,7 @@ import type {StoryType} from './types'
 type Props = {
 	onPress: string => any,
 	story: StoryType,
-	thumbnail: number,
+	thumbnail: false | number,
 }
 
 export class NewsRow extends React.PureComponent<Props> {
@@ -23,14 +23,19 @@ export class NewsRow extends React.PureComponent<Props> {
 
 	render() {
 		const {story} = this.props
-		const thumb = story.featuredImage
-			? {uri: story.featuredImage}
-			: this.props.thumbnail
+		const thumb =
+			this.props.thumbnail !== false
+				? story.featuredImage
+					? {uri: story.featuredImage}
+					: this.props.thumbnail
+				: null
 
 		return (
 			<ListRow arrowPosition="top" onPress={this._onPress}>
 				<Row alignItems="center">
-					<Image source={thumb} style={styles.image} />
+					{thumb !== null ? (
+						<Image source={thumb} style={styles.image} />
+					) : null}
 					<Column flex={1}>
 						<Title lines={2}>{story.title}</Title>
 						<Detail lines={3}>{story.excerpt}</Detail>