Merge pull request #3020 from StoDevX/event-urls-server

Move Event url extraction to ccc-server

Author: rye

flow-typed/npm/get-urls_v7.x.x.js

@@ -105,7 +105,6 @@
     "bugsnag-react-native": "2.10.2",
     "delay": "4.0.1",
     "events": "3.0.0",
-    "get-urls": "8.0.0",
     "glamorous-native": "1.4.0",
     "jsc-android": "224109.x.x",
     "keyword-search": "0.1.1",
@@ -152,7 +151,6 @@
     "tinycolor2": "1.4.1",
     "titlecase": "1.1.2",
     "url": "0.11.0",
-    "whatwg-url": "7.0.0",
     "wordwrap": "1.0.0"
   },
   "devDependencies": {

package.json

@@ -1,9 +1,5 @@
 // @flow
 
-// monkey-patches
-import './init/global--buffer'
-import './init/monkey-patch--url'
-
 // initialization
 import './init/constants'
 import './init/fetch'

source/app.js

@@ -2,7 +2,6 @@
 
 import {Platform, Alert, Linking, Share} from 'react-native'
 import RNCalendarEvents from 'react-native-calendar-events'
-import getUrls from 'get-urls'
 import type {EventType} from './types'
 import {notify} from '@frogpond/analytics'
 import {detailTimes} from './times'
@@ -91,12 +90,6 @@ async function requestCalendarAccess(): Promise<boolean> {
 	return true
 }
 
-export function getLinksFromEvent(event: EventType) {
-	// Clean up returns, newlines, tabs, and misc symbols...
-	// ...and search for links in the text
-	return Array.from(getUrls(event.description))
-}
-
 export function getTimes(event: EventType) {
 	const {allDay, start, end} = detailTimes(event)
 

source/init/global--buffer.js

@@ -8,7 +8,7 @@ import {openUrl} from '@frogpond/open-url'
 import {Card} from '../../components/card'
 import * as c from '@frogpond/colors'
 import {ButtonCell} from '@frogpond/tableview'
-import {getLinksFromEvent, shareEvent, getTimes} from './calendar-util'
+import {shareEvent, getTimes} from './calendar-util'
 import {AddToCalendar} from '../../components/add-to-calendar'
 import {ListFooter} from '@frogpond/lists'
 
@@ -84,7 +84,7 @@ export class EventDetail extends React.PureComponent<Props> {
 				<MaybeCard content={event.location} header="Location" />
 				<MaybeCard content={event.description} header="Description" />
 
-				<Links urls={getLinksFromEvent(event)} />
+				<Links urls={event.links} />
 
 				<AddToCalendar
 					event={event}

source/init/monkey-patch--url.js

@@ -7,7 +7,7 @@ import type {TopLevelViewPropsType} from '../types'
 import {ShareButton} from '../../components/nav-buttons'
 import {openUrl} from '@frogpond/open-url'
 import {ListFooter} from '@frogpond/lists'
-import {getLinksFromEvent, shareEvent, getTimes} from './calendar-util'
+import {shareEvent, getTimes} from './calendar-util'
 import {AddToCalendar} from '../../components/add-to-calendar'
 
 const styles = StyleSheet.create({
@@ -31,11 +31,9 @@ function MaybeSection({header, content}: {header: string, content: string}) {
 }
 
 function Links({header, event}: {header: string, event: EventType}) {
-	const links = getLinksFromEvent(event)
-
-	return links.length ? (
+	return event.links.length ? (
 		<Section header={header}>
-			{links.map(url => (
+			{event.links.map(url => (
 				<Cell
 					key={url}
 					accessory="DisclosureIndicator"

source/views/calendar/calendar-util.js

@@ -24,6 +24,7 @@ export type EventType = {
 	startTime: moment,
 	endTime: moment,
 	isOngoing: boolean,
+	links: Array<string>,
 	config: {
 		startTime: boolean,
 		endTime: boolean,

source/views/calendar/event-detail.android.js

@@ -3259,13 +3259,6 @@ get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
-[email protected]:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/get-urls/-/get-urls-8.0.0.tgz#62a0225cf96e2336b57e5041781f015141f81511"
-  dependencies:
-    normalize-url "^3.3.0"
-    url-regex "^4.0.0"
-
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -3666,10 +3659,6 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
-ip-regex@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd"
-
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -5323,10 +5312,6 @@ normalize-path@^2.0.1, normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-url@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
-
 npm-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
@@ -7172,10 +7157,6 @@ [email protected]:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/titlecase/-/titlecase-1.1.2.tgz#78113d1108086b8326331a3247dea8f5a49ea853"
 
-tlds@^1.187.0:
-  version "1.203.1"
-  resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.203.1.tgz#4dc9b02f53de3315bc98b80665e13de3edfc1dfc"
-
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -7223,7 +7204,7 @@ tough-cookie@>=2.3.3, tough-cookie@^2.2.0, tough-cookie@^2.3.3, tough-cookie@~2.
     psl "^1.1.24"
     punycode "^1.4.1"
 
-tr46@^1.0.0, tr46@^1.0.1:
+tr46@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
   dependencies:
@@ -7335,13 +7316,6 @@ urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
-url-regex@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/url-regex/-/url-regex-4.1.1.tgz#a5617b22e15e26dac57ce74c3f52088bcdfec995"
-  dependencies:
-    ip-regex "^1.0.1"
-    tlds "^1.187.0"
-
 url-template@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
@@ -7448,14 +7422,6 @@ whatwg-url-compat@~0.6.5:
   dependencies:
     tr46 "~0.0.1"
 
-[email protected]:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
-  dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^1.0.1"
-    webidl-conversions "^4.0.2"
-
 whatwg-url@^6.3.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.0.tgz#08fdf2b9e872783a7a1f6216260a1d66cc722e08"