diff --git a/src/pt/goyabu/AndroidManifest.xml b/src/pt/goyabu/AndroidManifest.xml
new file mode 100644
index 000000000..94339ee7a
--- /dev/null
+++ b/src/pt/goyabu/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="eu.kanade.tachiyomi.animeextension"/>
diff --git a/src/pt/goyabu/build.gradle b/src/pt/goyabu/build.gradle
new file mode 100644
index 000000000..1263411a7
--- /dev/null
+++ b/src/pt/goyabu/build.gradle
@@ -0,0 +1,14 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlinx-serialization'
+
+ext {
+    extName = 'Goyabu'
+    pkgNameSuffix = 'pt.goyabu'
+    extClass = '.Goyabu'
+    extVersionCode = 1
+    libVersion = '12'
+}
+
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/pt/goyabu/res/mipmap-hdpi/ic_launcher.png b/src/pt/goyabu/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..b2b90b7a7
Binary files /dev/null and b/src/pt/goyabu/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/pt/goyabu/res/mipmap-mdpi/ic_launcher.png b/src/pt/goyabu/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..5adebc468
Binary files /dev/null and b/src/pt/goyabu/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/pt/goyabu/res/mipmap-xhdpi/ic_launcher.png b/src/pt/goyabu/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..8c8548ae0
Binary files /dev/null and b/src/pt/goyabu/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/pt/goyabu/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/goyabu/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..d60fc7a76
Binary files /dev/null and b/src/pt/goyabu/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/pt/goyabu/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/goyabu/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..186a5f1e6
Binary files /dev/null and b/src/pt/goyabu/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/GYConstants.kt b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/GYConstants.kt
new file mode 100644
index 000000000..b669615ed
--- /dev/null
+++ b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/GYConstants.kt
@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi.animeextension.pt.goyabu
+
+object GYConstants {
+    const val ACCEPT_LANGUAGE = "pt-BR,pt;q=0.9,en-US;q=0.8,en;q=0.7"
+    const val USER_AGENT = "Mozilla/5.0 (iPad; CPU OS 13_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.4 Mobile/15E148 Safari/604.1"
+    const val PREFERRED_QUALITY = "preferred_quality"
+    const val PREFERRED_PLAYER = "preferred_player"
+    val QUALITY_LIST = arrayOf("SD", "HD")
+    val PLAYER_NAMES = arrayOf("Player 1", "Player 2")
+    val PLAYER_REGEX = Regex("""label: "(\w+)",.*file: "(.*?)"""")
+}
diff --git a/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/GYFilters.kt b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/GYFilters.kt
new file mode 100644
index 000000000..809ef7687
--- /dev/null
+++ b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/GYFilters.kt
@@ -0,0 +1,230 @@
+package eu.kanade.tachiyomi.animeextension.pt.goyabu
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+
+object GYFilters {
+
+    open class QueryPartFilter(
+        displayName: String,
+        val vals: Array<Pair<String, String>>
+    ) : AnimeFilter.Select<String>(
+        displayName,
+        vals.map { it.first }.toTypedArray()
+    ) {
+        fun toQueryPart() = vals[state].second
+    }
+
+    open class TriStateFilterList(name: String, values: List<TriState>) : AnimeFilter.Group<AnimeFilter.TriState>(name, values)
+    private class TriStateVal(name: String) : AnimeFilter.TriState(name)
+
+    private inline fun <reified R> AnimeFilterList.getFirst(): R {
+        return this.filterIsInstance<R>().first()
+    }
+
+    private inline fun <reified R> AnimeFilterList.asQueryPart(): String {
+        return this.getFirst<R>().let {
+            (it as QueryPartFilter).toQueryPart()
+        }
+    }
+
+    class LanguageFilter : QueryPartFilter("Idioma", GYFiltersData.languages)
+    class InitialLetterFilter : QueryPartFilter("Primeira letra", GYFiltersData.initialLetter)
+
+    class EpisodeFilter : AnimeFilter.Text("Episódios")
+    class EpisodeFilterMode : QueryPartFilter("Modo de filtro", GYFiltersData.episodeFilterMode)
+    class SortFilter : AnimeFilter.Sort(
+        "Ordenar",
+        GYFiltersData.orders.map { it.first }.toTypedArray(),
+        Selection(0, true)
+    )
+
+    class GenresFilter : TriStateFilterList(
+        "Gêneros",
+        GYFiltersData.genres.map { TriStateVal(it) }
+    )
+
+    val filterList = AnimeFilterList(
+        LanguageFilter(),
+        InitialLetterFilter(),
+        SortFilter(),
+        AnimeFilter.Separator(),
+        EpisodeFilter(),
+        EpisodeFilterMode(),
+        AnimeFilter.Separator(),
+        GenresFilter(),
+    )
+
+    data class FilterSearchParams(
+        val language: String = "",
+        val initialLetter: String = "",
+        val episodesFilterMode: String = ">=",
+        var numEpisodes: Int = 0,
+        var orderAscending: Boolean = true,
+        var sortBy: String = "",
+        val blackListedGenres: ArrayList<String> = ArrayList(),
+        val includedGenres: ArrayList<String> = ArrayList(),
+        var animeName: String = ""
+    )
+
+    internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams {
+        val searchParams = FilterSearchParams(
+            filters.asQueryPart<LanguageFilter>(),
+            filters.asQueryPart<InitialLetterFilter>(),
+            filters.asQueryPart<EpisodeFilterMode>(),
+        )
+
+        searchParams.numEpisodes = try {
+            filters.getFirst<EpisodeFilter>().state.toInt()
+        } catch (e: NumberFormatException) { 0 }
+
+        filters.getFirst<SortFilter>().state?.let {
+            val order = GYFiltersData.orders[it.index].second
+            searchParams.orderAscending = it.ascending
+            searchParams.sortBy = order
+        }
+
+        filters.getFirst<GenresFilter>()
+            .state.forEach { genre ->
+                if (genre.isIncluded()) {
+                    searchParams.includedGenres.add(genre.name)
+                } else if (genre.isExcluded()) {
+                    searchParams.blackListedGenres.add(genre.name)
+                }
+            }
+
+        return searchParams
+    }
+
+    private fun mustRemove(anime: SearchResultDto, params: FilterSearchParams): Boolean {
+        val epFilterMode = params.episodesFilterMode
+        return when {
+            params.animeName != "" && params.animeName.lowercase() !in anime.title.lowercase() -> true
+            anime.title == "null" -> true
+            params.language != "" && params.language !in anime.type -> true
+            params.initialLetter != "" && !anime.title.startsWith(params.initialLetter) -> true
+            params.blackListedGenres.size > 0 && params.blackListedGenres.any {
+                it.lowercase() in anime.genre.lowercase()
+            } -> true
+            params.includedGenres.size > 0 && params.includedGenres.any {
+                it.lowercase() !in anime.genre.lowercase()
+            } -> true
+            params.numEpisodes > 0 -> {
+                when (epFilterMode) {
+                    "==" -> params.numEpisodes != anime.videos
+                    ">=" -> params.numEpisodes >= anime.videos
+                    "<=" -> params.numEpisodes <= anime.videos
+                    else -> false
+                }
+            }
+            else -> false
+        }
+    }
+
+    fun MutableList<SearchResultDto>.applyFilterParams(params: FilterSearchParams) {
+        this.removeAll { anime -> mustRemove(anime, params) }
+        when (params.sortBy) {
+            "A-Z" -> {
+                if (!params.orderAscending)
+                    this.reverse()
+            }
+            "num" -> {
+                if (params.orderAscending)
+                    this.sortBy { it.videos }
+                else
+                    this.sortByDescending { it.videos }
+            }
+        }
+    }
+
+    private object GYFiltersData {
+
+        val languages = arrayOf(
+            Pair("Todos", ""),
+            Pair("Legendado", "Leg"),
+            Pair("Dublado", "Dub")
+        )
+
+        val orders = arrayOf(
+            Pair("Alfabeticamente", "A-Z"),
+            Pair("Por número de eps", "num")
+        )
+
+        val initialLetter = arrayOf(Pair("Qualquer uma", "")) + ('A'..'Z').map {
+            Pair(it.toString(), it.toString())
+        }.toTypedArray()
+
+        val episodeFilterMode = arrayOf(
+            Pair("Maior ou igual", ">="),
+            Pair("Menor ou igual", "<="),
+            Pair("Igual", "=="),
+        )
+
+        val genres = arrayOf(
+            "Alien",
+            "Animação Chinesa",
+            "Anjos",
+            "Artes Marciais",
+            "Astronautas",
+            "Aventura",
+            "Ação",
+            "Carros",
+            "Comédia",
+            "Crianças",
+            "Demência",
+            "Demônios",
+            "Drama",
+            "Ecchi",
+            "Escolar",
+            "Espacial",
+            "Espaço",
+            "Esporte",
+            "Fantasia",
+            "Fantasmas",
+            "Ficção Científica",
+            "Harém",
+            "Histórico",
+            "Horror",
+            "Idol",
+            "Infantil",
+            "Isekai",
+            "Jogo",
+            "Josei",
+            "Magia",
+            "Mecha",
+            "Militar",
+            "Mistério",
+            "Monstros",
+            "Magia",
+            "Música",
+            "Otaku",
+            "Paródia",
+            "Piratas",
+            "Policial",
+            "Psicológico",
+            "RPG",
+            "Realidade Virtual",
+            "Romance",
+            "Samurai",
+            "Sci-Fi",
+            "Seinen",
+            "Shoujo",
+            "Shoujo Ai",
+            "Shounen",
+            "Shounen Ai",
+            "Slice of life",
+            "Sobrenatural",
+            "Super Poder",
+            "Supernatural",
+            "Superpotência",
+            "Suspense",
+            "Teatro",
+            "Terror",
+            "Thriller",
+            "Vampiro",
+            "Vida Escolar",
+            "Yaoi",
+            "Yuri"
+        )
+    }
+}
diff --git a/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/Goyabu.kt b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/Goyabu.kt
new file mode 100644
index 000000000..156f922f5
--- /dev/null
+++ b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/Goyabu.kt
@@ -0,0 +1,305 @@
+package eu.kanade.tachiyomi.animeextension.pt.goyabu
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animeextension.pt.goyabu.GYFilters.applyFilterParams
+import eu.kanade.tachiyomi.animeextension.pt.goyabu.extractors.PlayerOneExtractor
+import eu.kanade.tachiyomi.animeextension.pt.goyabu.extractors.PlayerTwoExtractor
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.AnimesPage
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import rx.Observable
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import java.lang.Exception
+
+class Goyabu : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "Goyabu"
+
+    override val baseUrl = "https://goyabu.com"
+
+    override val lang = "pt-BR"
+
+    override val supportsLatest = true
+
+    override val client: OkHttpClient = network.cloudflareClient
+
+    private val json = Json {
+        ignoreUnknownKeys = true
+    }
+
+    private var searchJson: List<SearchResultDto>? = null
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    override fun headersBuilder(): Headers.Builder = Headers.Builder()
+        .add("Accept-Language", GYConstants.ACCEPT_LANGUAGE)
+        .add("Referer", baseUrl)
+
+    // ============================== Popular ===============================   
+    override fun popularAnimeSelector(): String = "div.item > div.anime-episode"
+    override fun popularAnimeRequest(page: Int): Request = GET(baseUrl)
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime: SAnime = SAnime.create()
+        anime.setUrlWithoutDomain(element.selectFirst("a").attr("href"))
+        anime.title = element.selectFirst("h3").text()
+        anime.thumbnail_url = element.selectFirst("img").attr("src")
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector() = throw Exception("not used")
+
+    override fun popularAnimeParse(response: Response): AnimesPage {
+        val document = response.asJsoup()
+        val content = document.select("div.episodes-container").get(2)
+        val animes = content.select(popularAnimeSelector()).map { element ->
+            popularAnimeFromElement(element)
+        }
+        return AnimesPage(animes, false)
+    }
+
+    // ============================== Episodes ==============================
+    override fun episodeListSelector(): String = "div.episodes-container > div.anime-episode"
+
+    private fun getAllEps(response: Response): List<SEpisode> {
+        val epList = mutableListOf<SEpisode>()
+        val url = response.request.url.toString()
+        val doc = if (url.contains("/videos/")) {
+            getRealDoc(response.asJsoup())
+        } else { response.asJsoup() }
+
+        val epElementList = doc.select(episodeListSelector())
+        epList.addAll(epElementList.map { episodeFromElement(it) })
+
+        val next = doc.selectFirst("div.naco > a.next")
+        if (next != null) {
+            val newResponse = client.newCall(GET(next.attr("href"))).execute()
+            epList.addAll(getAllEps(newResponse))
+        }
+        return epList
+    }
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        return getAllEps(response).reversed()
+    }
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        val episode = SEpisode.create()
+
+        episode.setUrlWithoutDomain(element.selectFirst("a").attr("href"))
+        val epName = element.selectFirst("h3").text().substringAfter("– ")
+        episode.name = epName
+        episode.episode_number = try {
+            epName.substringAfter(" ").substringBefore(" ").toFloat()
+        } catch (e: NumberFormatException) { 0F }
+        return episode
+    }
+
+    // ============================ Video Links =============================
+    override fun videoListParse(response: Response): List<Video> {
+        val document: Document = response.asJsoup()
+        val html: String = document.html()
+        val videoList = PlayerOneExtractor()
+            .videoListFromHtml(html)
+            .toMutableList()
+        val iframe = document.selectFirst("div#tab-2 > iframe")
+        if (iframe != null) {
+            val playerUrl = iframe.attr("src")
+            val video = PlayerTwoExtractor(client).videoFromPlayerUrl(playerUrl)
+            if (video != null)
+                videoList.add(video)
+        }
+        return videoList
+    }
+
+    override fun videoListSelector() = throw Exception("not used")
+    override fun videoFromElement(element: Element) = throw Exception("not used")
+    override fun videoUrlParse(document: Document) = throw Exception("not used")
+
+    // =============================== Search ===============================
+    override fun searchAnimeFromElement(element: Element) = throw Exception("not used")
+
+    private fun searchAnimeFromResult(result: SearchResultDto): SAnime {
+        val anime: SAnime = SAnime.create()
+        anime.title = result.title
+        anime.setUrlWithoutDomain("/assistir/" + result.slug)
+        anime.thumbnail_url = "$baseUrl/${result.cover}"
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector() = throw Exception("not used")
+
+    override fun searchAnimeSelector() = throw Exception("not used")
+
+    override fun searchAnimeParse(response: Response) = throw Exception("not used")
+
+    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+        val params = GYFilters.getSearchParameters(filters)
+        return Observable.just(searchAnimeRequest(page, query, params))
+    }
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = throw Exception("not used")
+
+    private fun searchAnimeRequest(page: Int, query: String, filterParams: GYFilters.FilterSearchParams): AnimesPage {
+        filterParams.animeName = query
+        if (searchJson == null) {
+            val body = client.newCall(GET("$baseUrl/api/show.php"))
+                .execute()
+                .body?.string().orEmpty()
+            searchJson = json.decodeFromString<List<SearchResultDto>>(body)
+        }
+        val mutableJson = searchJson!!.toMutableList()
+        mutableJson.applyFilterParams(filterParams)
+        val results = mutableJson.chunked(30)
+        val hasNextPage = results.size > page
+        val currentPage = if (results.size == 0) {
+            emptyList<SAnime>()
+        } else {
+            results.get(page - 1).map { searchAnimeFromResult(it) }
+        }
+        return AnimesPage(currentPage, hasNextPage)
+    }
+
+    // =========================== Anime Details ============================
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        val doc = getRealDoc(document)
+
+        val infos = doc.selectFirst("div.anime-cover")
+
+        anime.thumbnail_url = infos.selectFirst("img").attr("src")
+        anime.title = infos.selectFirst("div.anime-title").text()
+        anime.genre = infos.getInfo("Generos")
+        anime.status = parseStatus(infos.getInfo("Status"))
+
+        var desc = doc.selectFirst("div.anime-description").text() + "\n"
+        desc += "\n" + infos.getInfo("Alternativo", false)
+        desc += "\n" + infos.getInfo("Views", false)
+        desc += "\n" + infos.getInfo("Episódios", false)
+        anime.description = desc
+
+        return anime
+    }
+
+    // =============================== Latest ===============================
+    override fun latestUpdatesNextPageSelector() = "div#pagination a:contains(Próxima)"
+    override fun latestUpdatesSelector(): String = "div.releases-box div.anime-episode"
+
+    override fun latestUpdatesFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        val img = element.selectFirst("img")
+        anime.setUrlWithoutDomain(element.selectFirst("a").attr("href"))
+        anime.title = element.selectFirst("h3").text()
+        anime.thumbnail_url = img.attr("src")
+        return anime
+    }
+
+    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/page/$page/")
+
+    // ============================== Settings ============================== 
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+
+        val videoPlayerPref = ListPreference(screen.context).apply {
+            key = GYConstants.PREFERRED_PLAYER
+            title = "Player preferido"
+            entries = GYConstants.PLAYER_NAMES
+            entryValues = GYConstants.PLAYER_NAMES
+            setDefaultValue(GYConstants.PLAYER_NAMES.first())
+            summary = "%s"
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+
+        val videoQualityPref = ListPreference(screen.context).apply {
+            key = GYConstants.PREFERRED_QUALITY
+            title = "Qualidade preferida"
+            entries = GYConstants.QUALITY_LIST
+            entryValues = GYConstants.QUALITY_LIST
+            setDefaultValue(GYConstants.QUALITY_LIST.last())
+            summary = "%s"
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        screen.addPreference(videoPlayerPref)
+        screen.addPreference(videoQualityPref)
+    }
+
+    override fun getFilterList(): AnimeFilterList = GYFilters.filterList
+
+    // ============================= Utilities ==============================
+    private fun getRealDoc(document: Document): Document {
+        val player = document.selectFirst("div[itemprop=video]")
+        if (player != null) {
+            val url = document.selectFirst("div.anime-thumb-single > a").attr("href")
+            val req = client.newCall(GET(url)).execute()
+            return req.asJsoup()
+        } else {
+            return document
+        }
+    }
+
+    private fun Element.getInfo(item: String, cut: Boolean = true): String {
+        val text = this.selectFirst("div.anime-info-right div:contains($item)").text()
+        if (cut)
+            return text.substringAfter(": ")
+        else
+            return text.substringAfter(" ")
+    }
+
+    private fun parseStatus(statusString: String?): Int {
+        return when (statusString?.trim()) {
+            "Completo" -> SAnime.COMPLETED
+            "Em lançamento" -> SAnime.ONGOING
+            else -> SAnime.UNKNOWN
+        }
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(GYConstants.PREFERRED_QUALITY, null)
+        val player = preferences.getString(GYConstants.PREFERRED_PLAYER, null)
+        val newList = mutableListOf<Video>()
+        var preferred = 0
+        for (video in this) {
+            when {
+                quality != null && video.quality.contains(quality) -> {
+                    newList.add(preferred, video)
+                    preferred++
+                }
+                player != null && video.quality.contains(player) -> {
+                    newList.add(preferred, video)
+                    preferred++
+                }
+                else -> newList.add(video)
+            }
+        }
+        return newList
+    }
+}
diff --git a/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/dto/SearchResultDto.kt b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/dto/SearchResultDto.kt
new file mode 100644
index 000000000..67f8ec61e
--- /dev/null
+++ b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/dto/SearchResultDto.kt
@@ -0,0 +1,26 @@
+package eu.kanade.tachiyomi.animeextension.pt.goyabu
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.JsonTransformingSerializer
+
+@Serializable
+data class SearchResultDto(
+    val title: String,
+    val genre: String,
+    @Serializable(with = IntSerializer::class)
+    val videos: Int,
+    val cover: String,
+    val type: String,
+    val slug: String
+)
+
+object IntSerializer : JsonTransformingSerializer<Int>(Int.serializer()) {
+    override fun transformDeserialize(element: JsonElement): JsonElement {
+        return try {
+            JsonPrimitive(element.toString().toInt())
+        } catch (e: Exception) { JsonPrimitive(-1) }
+    }
+}
diff --git a/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerOneExtractor.kt b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerOneExtractor.kt
new file mode 100644
index 000000000..dc8ece543
--- /dev/null
+++ b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerOneExtractor.kt
@@ -0,0 +1,17 @@
+package eu.kanade.tachiyomi.animeextension.pt.goyabu.extractors
+
+import eu.kanade.tachiyomi.animeextension.pt.goyabu.GYConstants
+import eu.kanade.tachiyomi.animesource.model.Video
+
+class PlayerOneExtractor {
+
+    private val PREFIX = "Player 1"
+
+    fun videoListFromHtml(html: String): List<Video> {
+        return GYConstants.PLAYER_REGEX.findAll(html).map { it ->
+            val quality = "$PREFIX (${it.groupValues[1]})"
+            val videoUrl = it.groupValues[2]
+            Video(videoUrl, quality, videoUrl, null)
+        }.toList()
+    }
+}
diff --git a/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerTwoExtractor.kt b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerTwoExtractor.kt
new file mode 100644
index 000000000..50dbc11fd
--- /dev/null
+++ b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerTwoExtractor.kt
@@ -0,0 +1,25 @@
+package eu.kanade.tachiyomi.animeextension.pt.goyabu.extractors
+
+import eu.kanade.tachiyomi.animeextension.pt.goyabu.GYConstants
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+
+class PlayerTwoExtractor(private val client: OkHttpClient) {
+
+    private val PREFIX = "Player 2"
+
+    fun videoFromPlayerUrl(url: String): Video? {
+        val headers = Headers.headersOf("User-Agent", GYConstants.USER_AGENT)
+        val res = client.newCall(GET(url, headers)).execute()
+        val html = res.body?.string().orEmpty()
+        val match = GYConstants.PLAYER_REGEX.find(html)
+        if (match == null) {
+            return match
+        }
+        val quality = "$PREFIX (${match.groupValues[1]})"
+        val videoUrl = match.groupValues[2]
+        return Video(videoUrl, quality, videoUrl, null)
+    }
+}